Added base entity
Updated form class names