Change some case classes to case objects