GTOID improvements