Start refactoring to pass source type for better throttling
More refactoring to add operation source