Updated configuration to follow view-layer