Model updates

Fixed #4