Add three new classes