Added metadata deserialization.
Removed TODO.