Moving area logic to default controller