Added 2 data classes