removed the unused domain predicates
get rid of the wrapper classes
refactoring to enable usage of constants inside the parameter names
updated the model builder accordingly, other changes