Patch the new gateway classes in the Db component