Added remaining objects to data store, need to add relation tables