Upgraded Postmark module