-extern void afb_context_init(struct afb_context *context, struct AFB_clientCtx *session, const char *token);
-extern int afb_context_connect(struct afb_context *context, const char *uuid, const char *token);
+extern void afb_context_init(struct afb_context *context, struct afb_session *session, struct afb_token *token);
+extern void afb_context_init_validated(struct afb_context *context, struct afb_session *session);
+extern void afb_context_subinit(struct afb_context *context, struct afb_context *super);
+extern int afb_context_connect(struct afb_context *context, const char *uuid, struct afb_token *token);
+extern int afb_context_connect_validated(struct afb_context *context, const char *uuid);