enhancements for metadata-generator