Vito performance enhancements