Adjust Data Models