diff --git a/Cargo.toml b/Cargo.toml
index 858d8589..d4e37054 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,26 +13,19 @@ version = "0.3.0"
 edition = "2018"
 
 [dependencies]
-futures = "0.1.27"
-http = "0.1.17"
-hyper = "0.12.29"
-ruma-api = "0.8.0"
-ruma-api-macros = "0.5.0"
+ruma-api = "0.10.0"
 ruma-events = "0.12.0"
-ruma-identifiers = "0.13.0"
-ruma-signatures = "0.4.2"
-serde_json = "1.0.39"
-serde_urlencoded = "0.5.5"
-url_serde = "0.2.0"
+ruma-identifiers = "0.14.0"
+serde_json = "1.0.40"
 
 [dependencies.js_int]
-version = "0.1.0"
+version = "0.1.1"
 features = ["serde"]
 
 [dependencies.serde]
-version = "1.0.92"
+version = "1.0.98"
 features = ["derive"]
 
 [dependencies.url]
-version = "1.7.2"
+version = "2.0.0"
 features = ["serde"]
diff --git a/src/r0/account/change_password.rs b/src/r0/account/change_password.rs
index a69bc750..eb8a074d 100644
--- a/src/r0/account/change_password.rs
+++ b/src/r0/account/change_password.rs
@@ -1,7 +1,6 @@
 //! [POST /_matrix/client/r0/account/password](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-account-password)
 
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/account/deactivate.rs b/src/r0/account/deactivate.rs
index ff7919a8..99fa8fcc 100644
--- a/src/r0/account/deactivate.rs
+++ b/src/r0/account/deactivate.rs
@@ -1,7 +1,7 @@
 //! [POST /_matrix/client/r0/account/deactivate](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-account-deactivate)
 // TODO: missing request parameters
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/account/register.rs b/src/r0/account/register.rs
index 1a08df4e..a83da7cc 100644
--- a/src/r0/account/register.rs
+++ b/src/r0/account/register.rs
@@ -1,6 +1,6 @@
 //! [POST /_matrix/client/r0/register](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-register)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
 use serde::{Deserialize, Serialize};
 
diff --git a/src/r0/account/request_password_change_token.rs b/src/r0/account/request_password_change_token.rs
index 56394bfa..976ba5fd 100644
--- a/src/r0/account/request_password_change_token.rs
+++ b/src/r0/account/request_password_change_token.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/account/password/email/requestToken](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-account-password-email-requesttoken)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/account/request_register_token.rs b/src/r0/account/request_register_token.rs
index 628ffc4d..d06321cc 100644
--- a/src/r0/account/request_register_token.rs
+++ b/src/r0/account/request_register_token.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/register/email/requestToken](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-register-email-requesttoken)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/account/whoami.rs b/src/r0/account/whoami.rs
index 199fea39..8ae9414f 100644
--- a/src/r0/account/whoami.rs
+++ b/src/r0/account/whoami.rs
@@ -1,7 +1,6 @@
 //! [GET /_matrix/client/r0/account/whoami](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-account-whoami)
 
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/alias/create_alias.rs b/src/r0/alias/create_alias.rs
index bf23bc41..9cf460cf 100644
--- a/src/r0/alias/create_alias.rs
+++ b/src/r0/alias/create_alias.rs
@@ -1,8 +1,7 @@
 //! [PUT /_matrix/client/r0/directory/room/{roomAlias}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-directory-room-roomalias)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomAliasId, RoomId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/alias/delete_alias.rs b/src/r0/alias/delete_alias.rs
index 119aa68c..85ff53d2 100644
--- a/src/r0/alias/delete_alias.rs
+++ b/src/r0/alias/delete_alias.rs
@@ -1,8 +1,8 @@
 //! [DELETE /_matrix/client/r0/directory/room/{roomAlias}](https://matrix.org/docs/spec/client_server/r0.4.0.html#delete-matrix-client-r0-directory-room-roomalias)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::RoomAliasId;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/alias/get_alias.rs b/src/r0/alias/get_alias.rs
index 26ff81ca..93dca32a 100644
--- a/src/r0/alias/get_alias.rs
+++ b/src/r0/alias/get_alias.rs
@@ -1,8 +1,7 @@
 //! [GET /_matrix/client/r0/directory/room/{roomAlias}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-directory-room-roomalias)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomAliasId, RoomId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/config/set_global_account_data.rs b/src/r0/config/set_global_account_data.rs
index 4a41561f..0c9a4751 100644
--- a/src/r0/config/set_global_account_data.rs
+++ b/src/r0/config/set_global_account_data.rs
@@ -1,8 +1,7 @@
 //! [PUT /_matrix/client/r0/user/{userId}/account_data/{type}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-user-userid-account-data-type)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/config/set_room_account_data.rs b/src/r0/config/set_room_account_data.rs
index 43bf2ec2..86e3c343 100644
--- a/src/r0/config/set_room_account_data.rs
+++ b/src/r0/config/set_room_account_data.rs
@@ -1,8 +1,7 @@
 //! [PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/account_data/{type}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-user-userid-rooms-roomid-account-data-type)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/contact/create_contact.rs b/src/r0/contact/create_contact.rs
index eed34509..5b246cd4 100644
--- a/src/r0/contact/create_contact.rs
+++ b/src/r0/contact/create_contact.rs
@@ -1,6 +1,6 @@
 //! [POST /_matrix/client/r0/account/3pid](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-account-3pid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use serde::{Deserialize, Serialize};
 
 ruma_api! {
diff --git a/src/r0/contact/get_contacts.rs b/src/r0/contact/get_contacts.rs
index 4243c594..c7ba4814 100644
--- a/src/r0/contact/get_contacts.rs
+++ b/src/r0/contact/get_contacts.rs
@@ -1,6 +1,6 @@
 //! [GET /_matrix/client/r0/account/3pid](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-account-3pid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use serde::{Deserialize, Serialize};
 
 ruma_api! {
diff --git a/src/r0/contact/request_contact_verification_token.rs b/src/r0/contact/request_contact_verification_token.rs
index 3eade882..eb12902c 100644
--- a/src/r0/contact/request_contact_verification_token.rs
+++ b/src/r0/contact/request_contact_verification_token.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/account/3pid/email/requestToken](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-account-3pid-email-requesttoken)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/context/get_context.rs b/src/r0/context/get_context.rs
index a567e6e5..f3596019 100644
--- a/src/r0/context/get_context.rs
+++ b/src/r0/context/get_context.rs
@@ -1,9 +1,8 @@
 //! [GET /_matrix/client/r0/rooms/{roomId}/context/{eventId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-rooms-roomid-context-eventid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::collections::only;
 use ruma_identifiers::{EventId, RoomId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/directory/get_public_rooms.rs b/src/r0/directory/get_public_rooms.rs
index 6a70fd83..301af00a 100644
--- a/src/r0/directory/get_public_rooms.rs
+++ b/src/r0/directory/get_public_rooms.rs
@@ -1,7 +1,7 @@
 //! [GET /_matrix/client/r0/publicRooms](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-publicrooms)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomAliasId, RoomId};
 use serde::{Deserialize, Serialize};
 
diff --git a/src/r0/filter/create_filter.rs b/src/r0/filter/create_filter.rs
index 1cacee78..e6486860 100644
--- a/src/r0/filter/create_filter.rs
+++ b/src/r0/filter/create_filter.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/user/{userId}/filter](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-user-userid-filter)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 use super::FilterDefinition;
 
diff --git a/src/r0/filter/get_filter.rs b/src/r0/filter/get_filter.rs
index 0f8bea5a..dd9a9389 100644
--- a/src/r0/filter/get_filter.rs
+++ b/src/r0/filter/get_filter.rs
@@ -1,8 +1,8 @@
 //! [GET /_matrix/client/r0/user/{userId}/filter/{filterId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-user-userid-filter-filterid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use super::FilterDefinition;
 
diff --git a/src/r0/media/create_content.rs b/src/r0/media/create_content.rs
index c6ccc779..5cc22aec 100644
--- a/src/r0/media/create_content.rs
+++ b/src/r0/media/create_content.rs
@@ -1,7 +1,6 @@
 //! [POST /_matrix/media/r0/upload](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-media-r0-upload)
 
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
@@ -19,7 +18,7 @@ ruma_api! {
         #[ruma_api(query)]
         pub filename: Option<String>,
         /// The content type of the file being uploaded.
-        #[ruma_api(header = "CONTENT_TYPE")]
+        #[ruma_api(header = CONTENT_TYPE)]
         pub content_type: String,
         /// The file contents to upload.
         #[ruma_api(body)]
diff --git a/src/r0/media/get_content.rs b/src/r0/media/get_content.rs
index d8a974be..83f9d937 100644
--- a/src/r0/media/get_content.rs
+++ b/src/r0/media/get_content.rs
@@ -2,8 +2,7 @@
 
 //! [GET /_matrix/media/r0/download/{serverName}/{mediaId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-media-r0-download-servername-mediaid)
 
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
@@ -29,10 +28,10 @@ ruma_api! {
         #[ruma_api(body)]
         pub file: Vec<u8>,
         /// The content type of the file that was previously uploaded.
-        #[ruma_api(header = "CONTENT_TYPE")]
+        #[ruma_api(header = CONTENT_TYPE)]
         pub content_type: String,
         /// The name of the file that was previously uploaded, if set.
-        #[ruma_api(header = "CONTENT_DISPOSITION")]
+        #[ruma_api(header = CONTENT_DISPOSITION)]
         pub content_disposition: String,
     }
 }
diff --git a/src/r0/media/get_content_thumbnail.rs b/src/r0/media/get_content_thumbnail.rs
index 033864f2..82bea3d4 100644
--- a/src/r0/media/get_content_thumbnail.rs
+++ b/src/r0/media/get_content_thumbnail.rs
@@ -1,7 +1,7 @@
 //! [GET /_matrix/media/r0/thumbnail/{serverName}/{mediaId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-media-r0-thumbnail-servername-mediaid)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use serde::{Deserialize, Serialize};
 
 /// The desired resizing method.
diff --git a/src/r0/membership.rs b/src/r0/membership.rs
index d86584f6..833857dc 100644
--- a/src/r0/membership.rs
+++ b/src/r0/membership.rs
@@ -11,7 +11,8 @@ pub mod kick_user;
 pub mod leave_room;
 pub mod unban_user;
 
-use ruma_signatures::Signatures;
+use std::collections::HashMap;
+
 use serde::{Deserialize, Serialize};
 
 // TODO: spec requires a nesting ThirdPartySigned { signed: Signed { mxid: ..., ... } }
@@ -26,7 +27,7 @@ pub struct ThirdPartySigned {
     /// The Matrix ID of the user who issued the invite.
     pub sender: String,
     /// A signatures object containing a signature of the entire signed object.
-    pub signatures: Signatures,
+    pub signatures: HashMap<String, HashMap<String, String>>,
     /// The state key of the m.third_party_invite event.
     pub token: String,
 }
diff --git a/src/r0/membership/ban_user.rs b/src/r0/membership/ban_user.rs
index 9520a3bb..01f6636c 100644
--- a/src/r0/membership/ban_user.rs
+++ b/src/r0/membership/ban_user.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/rooms/{roomId}/ban](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-ban)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/forget_room.rs b/src/r0/membership/forget_room.rs
index be0b613a..360a4a51 100644
--- a/src/r0/membership/forget_room.rs
+++ b/src/r0/membership/forget_room.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/rooms/{roomId}/forget](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-forget)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/invite_user.rs b/src/r0/membership/invite_user.rs
index 8253b5dc..f0d59871 100644
--- a/src/r0/membership/invite_user.rs
+++ b/src/r0/membership/invite_user.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/rooms/{roomId}/invite](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-invite)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/join_room_by_id.rs b/src/r0/membership/join_room_by_id.rs
index bd9c2691..81fdca02 100644
--- a/src/r0/membership/join_room_by_id.rs
+++ b/src/r0/membership/join_room_by_id.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/rooms/{roomId}/join](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-join)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
 
 use super::ThirdPartySigned;
 
diff --git a/src/r0/membership/join_room_by_id_or_alias.rs b/src/r0/membership/join_room_by_id_or_alias.rs
index 467e5de5..bd0bf5e8 100644
--- a/src/r0/membership/join_room_by_id_or_alias.rs
+++ b/src/r0/membership/join_room_by_id_or_alias.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/join/{roomIdOrAlias}](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-join-roomidoralias)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, RoomIdOrAliasId};
-use serde::{Deserialize, Serialize};
 
 use super::ThirdPartySigned;
 
diff --git a/src/r0/membership/joined_members.rs b/src/r0/membership/joined_members.rs
index d7f7028e..614c0809 100644
--- a/src/r0/membership/joined_members.rs
+++ b/src/r0/membership/joined_members.rs
@@ -2,7 +2,7 @@
 
 use std::collections::HashMap;
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
 use serde::{Deserialize, Serialize};
 
diff --git a/src/r0/membership/joined_rooms.rs b/src/r0/membership/joined_rooms.rs
index f98beb48..c1266525 100644
--- a/src/r0/membership/joined_rooms.rs
+++ b/src/r0/membership/joined_rooms.rs
@@ -1,8 +1,7 @@
 //! [GET /_matrix/client/r0/joined_rooms](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-joined-rooms)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/kick_user.rs b/src/r0/membership/kick_user.rs
index e075b1b6..1d70a8e0 100644
--- a/src/r0/membership/kick_user.rs
+++ b/src/r0/membership/kick_user.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/rooms/{roomId}/kick](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-kick)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/leave_room.rs b/src/r0/membership/leave_room.rs
index f84c04a6..50e2a398 100644
--- a/src/r0/membership/leave_room.rs
+++ b/src/r0/membership/leave_room.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/rooms/{roomId}/leave](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-leave)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/membership/unban_user.rs b/src/r0/membership/unban_user.rs
index 859c6ad1..18746670 100644
--- a/src/r0/membership/unban_user.rs
+++ b/src/r0/membership/unban_user.rs
@@ -1,8 +1,8 @@
 //! [POST /_matrix/client/r0/rooms/{roomId}/unban](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-rooms-roomid-unban)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/get_presence.rs b/src/r0/presence/get_presence.rs
index 010894af..d06e35e2 100644
--- a/src/r0/presence/get_presence.rs
+++ b/src/r0/presence/get_presence.rs
@@ -1,10 +1,9 @@
 //! [GET /_matrix/client/r0/presence/{userId}/status](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-presence-userid-status)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::presence::PresenceState;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/get_subscribed_presences.rs b/src/r0/presence/get_subscribed_presences.rs
index 6fc323a1..d9bf384a 100644
--- a/src/r0/presence/get_subscribed_presences.rs
+++ b/src/r0/presence/get_subscribed_presences.rs
@@ -1,9 +1,8 @@
 //! [GET /_matrix/client/r0/presence/list/{userId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-presence-list-userid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::presence::PresenceEvent;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/set_presence.rs b/src/r0/presence/set_presence.rs
index bfca3309..5d0aa325 100644
--- a/src/r0/presence/set_presence.rs
+++ b/src/r0/presence/set_presence.rs
@@ -1,9 +1,8 @@
 //! [PUT /_matrix/client/r0/presence/{userId}/status](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-presence-userid-status)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::presence::PresenceState;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/presence/update_presence_subscriptions.rs b/src/r0/presence/update_presence_subscriptions.rs
index 3aacbd05..7832967c 100644
--- a/src/r0/presence/update_presence_subscriptions.rs
+++ b/src/r0/presence/update_presence_subscriptions.rs
@@ -1,8 +1,7 @@
 //! [POST /_matrix/client/r0/presence/list/{userId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-presence-list-userid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/get_avatar_url.rs b/src/r0/profile/get_avatar_url.rs
index 30887550..8f91296c 100644
--- a/src/r0/profile/get_avatar_url.rs
+++ b/src/r0/profile/get_avatar_url.rs
@@ -1,8 +1,7 @@
 //! [GET /_matrix/client/r0/profile/{userId}/avatar_url](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-profile-userid-avatar-url)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/get_display_name.rs b/src/r0/profile/get_display_name.rs
index f9f6e298..47d033a4 100644
--- a/src/r0/profile/get_display_name.rs
+++ b/src/r0/profile/get_display_name.rs
@@ -1,8 +1,7 @@
 //! [GET /_matrix/client/r0/profile/{userId}/displayname](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-profile-userid-displayname)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/get_profile.rs b/src/r0/profile/get_profile.rs
index 457624ab..6526032f 100644
--- a/src/r0/profile/get_profile.rs
+++ b/src/r0/profile/get_profile.rs
@@ -1,8 +1,8 @@
 //! [GET /_matrix/client/r0/profile/{userId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-profile-userid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/set_avatar_url.rs b/src/r0/profile/set_avatar_url.rs
index 778dda30..65eb1c33 100644
--- a/src/r0/profile/set_avatar_url.rs
+++ b/src/r0/profile/set_avatar_url.rs
@@ -1,8 +1,8 @@
 //! [PUT /_matrix/client/r0/profile/{userId}/avatar_url](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-profile-userid-avatar-url)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/profile/set_display_name.rs b/src/r0/profile/set_display_name.rs
index 01c4cd34..37bf8230 100644
--- a/src/r0/profile/set_display_name.rs
+++ b/src/r0/profile/set_display_name.rs
@@ -1,8 +1,7 @@
 //! [PUT /_matrix/client/r0/profile/{userId}/displayname](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-profile-userid-displayname)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/receipt/create_receipt.rs b/src/r0/receipt/create_receipt.rs
index 58d6f933..02915540 100644
--- a/src/r0/receipt/create_receipt.rs
+++ b/src/r0/receipt/create_receipt.rs
@@ -2,7 +2,7 @@
 
 use std::fmt::{Display, Error as FmtError, Formatter};
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{EventId, RoomId};
 use serde::{Deserialize, Serialize};
 
diff --git a/src/r0/redact/redact_event.rs b/src/r0/redact/redact_event.rs
index d2845fb5..b79f813c 100644
--- a/src/r0/redact/redact_event.rs
+++ b/src/r0/redact/redact_event.rs
@@ -1,8 +1,7 @@
 //! [PUT /_matrix/client/r0/rooms/{roomId}/redact/{eventId}/{txnId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-rooms-roomid-redact-eventid-txnid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{EventId, RoomId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/room/create_room.rs b/src/r0/room/create_room.rs
index a54f31f5..3bdce4b5 100644
--- a/src/r0/room/create_room.rs
+++ b/src/r0/room/create_room.rs
@@ -1,6 +1,6 @@
 //! [POST /_matrix/client/r0/createRoom](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-createroom)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
 use serde::{Deserialize, Serialize};
 
diff --git a/src/r0/search/search_events.rs b/src/r0/search/search_events.rs
index 368d1113..14fd814a 100644
--- a/src/r0/search/search_events.rs
+++ b/src/r0/search/search_events.rs
@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::collections::all::Event;
 use ruma_identifiers::{EventId, RoomId, UserId};
 use serde::{Deserialize, Serialize};
diff --git a/src/r0/send/send_message_event.rs b/src/r0/send/send_message_event.rs
index 4f55978c..c97fd0a1 100644
--- a/src/r0/send/send_message_event.rs
+++ b/src/r0/send/send_message_event.rs
@@ -1,9 +1,8 @@
 //! [PUT /_matrix/client/r0/rooms/{roomId}/send/{eventType}/{txnId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-rooms-roomid-send-eventtype-txnid)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::{room::message::MessageEventContent, EventType};
 use ruma_identifiers::{EventId, RoomId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/send/send_state_event_for_empty_key.rs b/src/r0/send/send_state_event_for_empty_key.rs
index f6b10396..2b51874c 100644
--- a/src/r0/send/send_state_event_for_empty_key.rs
+++ b/src/r0/send/send_state_event_for_empty_key.rs
@@ -1,9 +1,9 @@
 //! [PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-rooms-roomid-state-eventtype)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::{EventId, RoomId};
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/send/send_state_event_for_key.rs b/src/r0/send/send_state_event_for_key.rs
index 335de505..7286bcee 100644
--- a/src/r0/send/send_state_event_for_key.rs
+++ b/src/r0/send/send_state_event_for_key.rs
@@ -1,9 +1,8 @@
 //! [PUT /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-rooms-roomid-state-eventtype-statekey)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::{EventId, RoomId};
-use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 ruma_api! {
diff --git a/src/r0/server/get_user_info.rs b/src/r0/server/get_user_info.rs
index 1c16795f..c5a59d64 100644
--- a/src/r0/server/get_user_info.rs
+++ b/src/r0/server/get_user_info.rs
@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
 use serde::{Deserialize, Serialize};
 
diff --git a/src/r0/session/login.rs b/src/r0/session/login.rs
index fd76156c..720ad1a5 100644
--- a/src/r0/session/login.rs
+++ b/src/r0/session/login.rs
@@ -1,6 +1,6 @@
 //! [POST /_matrix/client/r0/login](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-login)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::UserId;
 use serde::{Deserialize, Serialize};
 
diff --git a/src/r0/session/logout.rs b/src/r0/session/logout.rs
index 1f3286f2..5f3b5090 100644
--- a/src/r0/session/logout.rs
+++ b/src/r0/session/logout.rs
@@ -1,6 +1,6 @@
 //! [POST /_matrix/client/r0/logout](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-logout)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/session/logout_all.rs b/src/r0/session/logout_all.rs
index 4815e539..b8613c05 100644
--- a/src/r0/session/logout_all.rs
+++ b/src/r0/session/logout_all.rs
@@ -1,6 +1,6 @@
 //! [POST /_matrix/client/r0/logout/all](https://matrix.org/docs/spec/client_server/r0.4.0.html#post-matrix-client-r0-logout-all)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_member_events.rs b/src/r0/sync/get_member_events.rs
index c4e0d20a..e1f7cf5f 100644
--- a/src/r0/sync/get_member_events.rs
+++ b/src/r0/sync/get_member_events.rs
@@ -1,9 +1,9 @@
 //! [GET /_matrix/client/r0/rooms/{roomId}/members](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-rooms-roomid-members)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::room::member::MemberEvent;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_message_events.rs b/src/r0/sync/get_message_events.rs
index 4498bcdf..6c573dc0 100644
--- a/src/r0/sync/get_message_events.rs
+++ b/src/r0/sync/get_message_events.rs
@@ -1,7 +1,7 @@
 //! [GET /_matrix/client/r0/rooms/{roomId}/messages](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-rooms-roomid-messages)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::collections::only;
 use ruma_identifiers::RoomId;
 use serde::{Deserialize, Serialize};
diff --git a/src/r0/sync/get_state_events.rs b/src/r0/sync/get_state_events.rs
index 766e0db2..0636ac73 100644
--- a/src/r0/sync/get_state_events.rs
+++ b/src/r0/sync/get_state_events.rs
@@ -1,9 +1,8 @@
 //! [GET /_matrix/client/r0/rooms/{roomId}/state](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-rooms-roomid-state)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::collections::only;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_state_events_for_empty_key.rs b/src/r0/sync/get_state_events_for_empty_key.rs
index e690e61b..d2b03a54 100644
--- a/src/r0/sync/get_state_events_for_empty_key.rs
+++ b/src/r0/sync/get_state_events_for_empty_key.rs
@@ -1,9 +1,8 @@
 //! [GET /_matrix/client/r0/rooms/{roomId}/state/{eventType}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-rooms-roomid-state-eventtype)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/get_state_events_for_key.rs b/src/r0/sync/get_state_events_for_key.rs
index a26527c8..bdeeb5ac 100644
--- a/src/r0/sync/get_state_events_for_key.rs
+++ b/src/r0/sync/get_state_events_for_key.rs
@@ -1,9 +1,8 @@
 //! [GET /_matrix/client/r0/rooms/{roomId}/state/{eventType}/{stateKey}](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-rooms-roomid-state-eventtype-state-key)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::EventType;
 use ruma_identifiers::RoomId;
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/sync/sync_events.rs b/src/r0/sync/sync_events.rs
index 45d95b6f..84aaa945 100644
--- a/src/r0/sync/sync_events.rs
+++ b/src/r0/sync/sync_events.rs
@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::{
     collections::{all, only},
     stripped,
diff --git a/src/r0/tag/create_tag.rs b/src/r0/tag/create_tag.rs
index 93c57b5f..4aef78dc 100644
--- a/src/r0/tag/create_tag.rs
+++ b/src/r0/tag/create_tag.rs
@@ -1,9 +1,8 @@
 //! [PUT /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-user-userid-rooms-roomid-tags-tag)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::tag::TagInfo;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/tag/delete_tag.rs b/src/r0/tag/delete_tag.rs
index 9ad3bbdc..ffe3adbe 100644
--- a/src/r0/tag/delete_tag.rs
+++ b/src/r0/tag/delete_tag.rs
@@ -1,8 +1,7 @@
 //! [DELETE /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags/{tag}](https://matrix.org/docs/spec/client_server/r0.4.0.html#delete-matrix-client-r0-user-userid-rooms-roomid-tags-tag)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/tag/get_tags.rs b/src/r0/tag/get_tags.rs
index ddc384e8..019bc4df 100644
--- a/src/r0/tag/get_tags.rs
+++ b/src/r0/tag/get_tags.rs
@@ -1,9 +1,8 @@
 //! [GET /_matrix/client/r0/user/{userId}/rooms/{roomId}/tags](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-user-userid-rooms-roomid-tags)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_events::tag::TagEventContent;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/typing/create_typing_event.rs b/src/r0/typing/create_typing_event.rs
index d1178596..29356e12 100644
--- a/src/r0/typing/create_typing_event.rs
+++ b/src/r0/typing/create_typing_event.rs
@@ -1,9 +1,8 @@
 //! [PUT /_matrix/client/r0/rooms/{roomId}/typing/{userId}](https://matrix.org/docs/spec/client_server/r0.4.0.html#put-matrix-client-r0-rooms-roomid-typing-userid)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use ruma_identifiers::{RoomId, UserId};
-use serde::{Deserialize, Serialize};
 
 ruma_api! {
     metadata {
diff --git a/src/r0/voip/get_turn_server_info.rs b/src/r0/voip/get_turn_server_info.rs
index 03fce2c3..15df4e77 100644
--- a/src/r0/voip/get_turn_server_info.rs
+++ b/src/r0/voip/get_turn_server_info.rs
@@ -1,8 +1,7 @@
 //! [GET /_matrix/client/r0/voip/turnServer](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-voip-turnserver)
 
 use js_int::UInt;
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {
diff --git a/src/unversioned/discover_homeserver.rs b/src/unversioned/discover_homeserver.rs
index 5070419b..96b66769 100644
--- a/src/unversioned/discover_homeserver.rs
+++ b/src/unversioned/discover_homeserver.rs
@@ -1,6 +1,6 @@
 //! [GET /.well-known/matrix/client](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-well-known-matrix-client)
 
-use ruma_api_macros::ruma_api;
+use ruma_api::ruma_api;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -8,7 +8,6 @@ use url::Url;
 #[derive(Clone, Debug, Deserialize, Hash, PartialEq, PartialOrd, Serialize)]
 pub struct HomeserverInfo {
     /// The base URL for the homeserver for client-server connections.
-    #[serde(with = "url_serde")]
     pub base_url: Url,
 }
 
@@ -16,7 +15,6 @@ pub struct HomeserverInfo {
 #[derive(Clone, Debug, Deserialize, Hash, PartialEq, PartialOrd, Serialize)]
 pub struct IdentityServerInfo {
     /// The base URL for the identity server for client-server connections.
-    #[serde(with = "url_serde")]
     pub base_url: Url,
 }
 
diff --git a/src/unversioned/get_supported_versions.rs b/src/unversioned/get_supported_versions.rs
index 3d0538ef..5d98b957 100644
--- a/src/unversioned/get_supported_versions.rs
+++ b/src/unversioned/get_supported_versions.rs
@@ -1,7 +1,6 @@
 //! [GET /_matrix/client/versions](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-versions)
 
-use ruma_api_macros::ruma_api;
-use serde::{Deserialize, Serialize};
+use ruma_api::ruma_api;
 
 ruma_api! {
     metadata {