Add in bidirectionality