Merge register_props and add_props
Merge add_data and register_data