diff --git a/Cargo.lock b/Cargo.lock
index fa67ba6..53ed8be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1856,7 +1856,7 @@ checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "rwf"
-version = "0.1.8"
+version = "0.1.9"
 dependencies = [
  "aes",
  "aes-gcm-siv",
@@ -1920,7 +1920,7 @@ dependencies = [
 
 [[package]]
 name = "rwf-macros"
-version = "0.1.7"
+version = "0.1.8"
 dependencies = [
  "pluralizer",
  "proc-macro2",
diff --git a/rwf-macros/Cargo.toml b/rwf-macros/Cargo.toml
index ed8231c..814ee55 100644
--- a/rwf-macros/Cargo.toml
+++ b/rwf-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rwf-macros"
-version = "0.1.7"
+version = "0.1.8"
 edition = "2021"
 license = "MIT"
 description = "Macros for the Rust Web Framework"
diff --git a/rwf-macros/src/lib.rs b/rwf-macros/src/lib.rs
index 607a638..1186b1a 100644
--- a/rwf-macros/src/lib.rs
+++ b/rwf-macros/src/lib.rs
@@ -132,6 +132,11 @@ pub fn derive_model(input: TokenStream) -> TokenStream {
     model::impl_derive_model(input)
 }
 
+/// Create a WebSocket controller.
+///
+/// This implements mappings between the `Controller`
+/// trait and the struct implementing
+/// the `WebsocketController` trait.
 #[proc_macro_derive(WebsocketController, attributes(auth, middleware, skip_csrf))]
 pub fn derive_websocket_controller(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -159,6 +164,11 @@ pub fn derive_websocket_controller(input: TokenStream) -> TokenStream {
     }.into()
 }
 
+/// Create a Model controller.
+///
+/// This implements mappings between the `Controller`
+/// trait and the struct implementing
+/// the `ModelController` trait.
 #[proc_macro_derive(ModelController, attributes(auth, middleware, skip_csrf))]
 pub fn derive_model_controller(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -250,6 +260,11 @@ fn handle_overrides(attributes: &[Attribute]) -> proc_macro2::TokenStream {
     }
 }
 
+/// Create a Page controller.
+///
+/// This implements mappings between the `Controller`
+/// trait and the struct implementing
+/// the `PageController` trait.
 #[proc_macro_derive(PageController, attributes(auth, middleware, skip_csrf))]
 pub fn derive_page_controller(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -273,6 +288,11 @@ pub fn derive_page_controller(input: TokenStream) -> TokenStream {
     }.into()
 }
 
+/// Create a REST controller.
+///
+/// This implements mappings between the `Controller`
+/// trait and the struct implementing
+/// the `RestController` trait.
 #[proc_macro_derive(RestController, attributes(auth, middleware, skip_csrf))]
 pub fn derive_rest_controller(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -296,6 +316,8 @@ pub fn derive_rest_controller(input: TokenStream) -> TokenStream {
     }.into()
 }
 
+/// Automatically implement the `FromRow` trait.
+/// Converts database rows to Rust struct fields.
 #[proc_macro_derive(FromRow)]
 pub fn derive_from_row(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -328,6 +350,9 @@ pub fn derive_from_row(input: TokenStream) -> TokenStream {
     }
 }
 
+/// Automatically implement the `ToTemplateValue` trait
+/// for the Rust struct. This allows to use the struct
+/// directly in template contexts.
 #[proc_macro_derive(TemplateValue)]
 pub fn derive_template_value(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -362,6 +387,9 @@ pub fn derive_template_value(input: TokenStream) -> TokenStream {
     }
 }
 
+/// Automatically implement the `FromFormData` trait.
+/// Allows to extract values from a HTTP form and
+/// convert it to a Rust struct.
 #[proc_macro_derive(Form)]
 pub fn derive_form(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -415,6 +443,9 @@ pub fn derive_form(input: TokenStream) -> TokenStream {
     }
 }
 
+/// Allows to automatically convert a Rust struct into a
+/// template context. Templates can then define
+/// strictly-typed contexts for additional type safety.
 #[proc_macro_derive(Context)]
 pub fn drive_context(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -464,6 +495,7 @@ pub fn drive_context(input: TokenStream) -> TokenStream {
     }
 }
 
+/// Not currently used.
 #[proc_macro]
 pub fn error(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
@@ -502,6 +534,10 @@ pub fn route(input: TokenStream) -> TokenStream {
     .into()
 }
 
+/// Create CRUD routes for the controller.
+///
+/// CRUD routes include multiple routes following the
+/// REST specification.
 #[proc_macro]
 pub fn crud(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input with Punctuated<Expr, Token![=>]>::parse_terminated);
@@ -516,6 +552,7 @@ pub fn crud(input: TokenStream) -> TokenStream {
     .into()
 }
 
+/// Create REST routes for the controller.
 #[proc_macro]
 pub fn rest(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input with Punctuated<Expr, Token![=>]>::parse_terminated);
@@ -530,6 +567,7 @@ pub fn rest(input: TokenStream) -> TokenStream {
     .into()
 }
 
+/// Create a route and mount an engine on it.
 #[proc_macro]
 pub fn engine(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input with Punctuated<Expr, Token![=>]>::parse_terminated);
diff --git a/rwf/Cargo.toml b/rwf/Cargo.toml
index fb82217..378f0e6 100644
--- a/rwf/Cargo.toml
+++ b/rwf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rwf"
-version = "0.1.8"
+version = "0.1.9"
 edition = "2021"
 license = "MIT"
 description = "Framework for building web applications in the Rust programming language"
@@ -32,7 +32,7 @@ parking_lot = "0.12"
 once_cell = "1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-rwf-macros = { path = "../rwf-macros", version = "0.1.7" }
+rwf-macros = { path = "../rwf-macros", version = "0.1.8" }
 colored = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"