validate: Add add-layer and remove-layer