Include base/return types again.

Changed the timestamp to be a string type to allow for schema generation. But it still needs to be a valid timestamp for posting data.