Now building meta data correctly.