Added post-messages support