Add Gio support