Remodel Result classes to make more sense