Refactored layers and scope property usage