Added dictionary service and tests