Added a dict wrapper