Finishing implementation of all the features for the layer system