Use macros to reduce boilerplate code (#282)

Use macros to reduce boilerplate code (#282) #650