Add duplication check for parameter mapping and some house keeping