More types for Rules[M, _]
remove unused Rule
Rename Mappings to Rules
Remove Contraints, move constraints into Rules