#5 Added Option class consideration in Map and case class resolver