Moved additional user info to profile model.
Fixed merge conflict.