Changes to support D6 POST