Improved metadata, used variables