Gateways creation moved out from builder