Change macros to work with dommy instead