Added Gravatar model, adjusted current models