Some classes seem to have not been added trying to fix