Refactored: new Area - Store organized