Implemented support for metadata