Implicit conversion to case classes

Fixed.