Add data modeling work