Adding support for dynamic modals