switch to using types defined in atma/types.hpp