Added support for <object>