Updates with recent model changes
0.1.4