Doing some operations refactoring and getting ready for generation