modified some data structures

Signed-off-by: Hongyi Jia <Hongyi.Jia.GR@dartmouth.edu>