Add optional arguments to moment conditions