Support for Optional added. Metric added