Fixed problems with parameter map interface