Refactoring of the modality type
More useful this way, easier to decompose and match