Added username and user picture to User model