There's probably a more optimum layout for this dict, but this is backwards compatible...