Added support for user defined layer names