Add option for Hyperswitch and Aldred 2