Better compressed key handling