use different classes for different accept headers
Merge branch 'refactor' into develop-2