Rewrite how scope layers are added