Refactor a bit, do not metadata unindexed properties.