use property codes
adjust schema