Improve word types classifier