Added custom metadata injection;