Initial refactoring to the Feature API.
Adding IdentityClass.