Improved HTTP mappings