Add builder classes, make them the only parameter to macro methods

Add builder classes, make them the only parameter to macro methods #371