Refactor, no more generic paramter map.