replace some more attr with prop