Added map and on the way to get creating the correct param decl list