Several updates to messenger and sql composable base classes