updated entities and forms