Added a more reliable dictionary accessor