Added support for other elements