Correctly set type and serialize correct value for References

Conflicts:
	CHANGELOG.md