Add more metadata shit it seems