Fix an error in the body parser
Added internal storage to Tomahawk