added message interception support