Is it worth rewriting these methods to use the functionality in BaseModal?