Implementing better idnetity management