Updated for new Dictionary format