Template improvements
SchemaAttributes improved