Update generic form class + recreate request form