Refactored API for meta-data