Added correct class modifiers.