Updated types, constants, and modifiers.