Added metadata and timer