Fixes #119 Use single user model instead of two