More classes converted in