Add metadata package
Merge local changes