Corrected equals & hashcode methods in extension keys