Added choosing of class.