simple User model added, refactoring