Model updates

Model updates to handle 's