Reworked layer properties