Switched key type to get better hashcode