Added containers.Map object to CheckParameter
Handled merge conflict