Moved location to separate module