Graphite optimizations additions