updated base form structure