Prop changed to Param and other