Added classifiers, prepared for GA optimization