Refactoring to add in v2/v4 signature split. Hopefully also caters for XML/JSON split...