ENHANCED: Improvements to metadata returned.