Organized entities more carefully
Proxy passed Content Type from original request