adding support to fill the pairing mappings with zero where necessary