Further updates to meta-data extraction code