Update #283 - More refactoring changes