Added base entities
Body field is now optional
Updated form class names