Lot of changes, included instances, templates and API