Deal manager logic improvements
New data types added
Some refactoring and renaming