Add missing fields in schema: entity types, fields, layout, layout options, listener.
Add some missing keys in entity info.