Improve metadata for views integration