Finished extra examples and simplification of the User model