Unified layer automation

Unified layer automation