fix(metadata) Fix metadata storage for Amazon
Merge pull request #152 from amagdas/master

fix(metadata) Fix metadata storage for Amazon