changed group models to LocatableEntity