Removed special classes for Headers and Parameters