adjusted to new user entity

and refactored dataGenerator a bit