Sorting out issues related to parameter map interface refactoring. This commit breaks the build