Dry fy shared logic and add util Modifiers contract

Dry fy shared logic and add util Modifiers contract #2543