Add refactored gw to resume