Added dictionary and dictionary entity classes