Customer metadata Fixes #44