Fixes and improvements: Missing fields amended as part of cat testing