Corrected models to handle location data