Added changes to the editors to help with gateways