Refactor identity statement implementations