Add more metadata #283