Default back to using dictionary (temporary)