add selector matching into mappings