Added dictionary parsing.