Performance improvements - OoM still there :-(