Some cleanup
Update overload
Update identity