kept model in sync with changes
Release 0.0.6