Added parameters to macro