Refactor of identity existing follows