Add multi-layer support