Refactored groups to areas