Added functions for handling the data location recognition. Moved many overriden functions