2nd part of the layer/profile rework [1/2]