Made API more mono-d compatible