Added dictioanry to optimize