Add more fields in the Origin type