More work on the POST support