Continuing to implement layer management