fixes for IPD

Add in parameter and metadata injection