Added mapping case classes