removed hardcodes of properties names