Updates to work with iframes