Improved data modeling