Updated for restructuring of http-values