Few modifications
Finished metadata updates