Adding TODO before a revert
Deciding to patch scope type by storing it on the identifier