added LocatableEntity