Added metadata and fix cert