Removed reference to Optional that caused compilation problem