Started working with metadata
Updated todo