Completely modularized all Modifiers