Some updates to the types to make things neater for the client.