Missing classes added #1