Refactored more classes to the typesafe "fromLotus" calls