More refactoring and version bump