Further integration of metadata