Added cost models
Merge origin/MainBranch into MainBranch