Fixing static library to match new data model