Add support for object tags inside normal frames