Fixing the issue with contracts parameter mapping