Model updates.
Conflicts resolved.
Updated API