Tox compability added