rework property validation