Make metadata more generic