modiyf model to simplify data structure