Minor parameters refactoring
Merged changes