Refactoring to match neworg definitions