Progress on data structure and kernel