Added location to default components