Added and integrated form class