amended messages and subscriptions tables