Add avatars, risk and version fields