Improve POST / PUT support