Added macro parameters