added ReturnDeserializer and a bunch of empty classes