Fixed adding import of different case classes for few times (including scala.Some...)