Abstracted data into Obj, moved to data_types file