Improved Keshif data initialization