Add user_ref in companion