Updated Modifiers and Class Types