Change API to use Utils::Location