Minor additions of code for preliminary import of Cloudstack-inspired functionality