Updated EntityTypeController