Update generator to handle meta-data generation