Additional refactors