adding support for layer names