Implement new identity engines architecture