Added missing location variable to entities.