Add dynamic args that work with new, old, and any other format