Adding manage layer functionality