Fixed, further case classes