Added metadata and CLI