Added macros for metadata