Adding support for layer export