Added more word classes