New class and some new names