Expanded 'layer' support