Adding 5.1.1 support for kc. Updating to use new classes classifier