class vars and props type fix