Switched from single object to imo more obvious params