Fix model based on unit test failures.
+ add type annotations on model