Fixed issues with parameter map interface