[WIP] Feature/push metadata