More refactor pending changes