Changed the defaults for class id