Updated forms, entities and controllers