create VM endpoint support, few more fixes