Add rotate_match
Add operator function and mappings