More refactoring based functionality.