Btw if these do come back the new Configuration classes would have to be added here obviously and they would need their own equals/hashcode methods.