Examining data modeling... may make changes