More refactoring to the newly added methods