Minor changes on data structure