Remove dependency on hashable