AAI: use (more safe) c++ datatypes