KNL-208  Improve load time