Added custom metadata management