[HelixJack] Some Improvements