Updated marshaller to support form encoded data