Better handling of meta data