Added support for other layers

Added support for other layers