added more classes to be properly deserialised