Changes for adding more metadata information