Added gallery & media entity; Cleaned up enum types.