Added some data classes