Convert connect_baton_t to a class