Entity{Metadata,Schema} fields are back to being private, protected setters where approriate added