Refactor for areas