Fix support for other layers