Adding three new classes