improve gio support