Created answer model. AppUser customization.
Fixed merge conflicts.