Major performance updates