Meta data improvements