More optimization
Version bump