fixed linker error and update the data model