Improve LXD scenario support