Switch to using <object>