Adding updated classifier code
Updated props features code
Revert "Adding updated classifier code"

This reverts commit 691321e93a4bc6d632ec9597ae445e2a09a94d52.