Update identity handling :smile: