Adapted to Locatable interface removed from curir