Added classifications automatically, bug fix