updates to use statements, added new service templates