Further changes to replace the usage of classify with decode