JSON response types unified / refactor