New way of metadata handling