Added location to schema