Minor changes on DATA Structure