Refactored domain classes to support Areas in Widgets