Refactor plumbings for better content negotiation