Switch to internal layer system