This is just some extra handlers + docs.