Make classification field configurable
Try to be smarter (?)
Revert change (didn't work)