Improved support with GC