use singular model form

Fixes #3