Forgot to convert some class calls to external calls