fix: Added the same structure on return for required fields