Added support for custom modals