Adding fields support and simplifying http support.