UPD: UserIdentity rewrite to PSR