Base cloud support, template changes