Added missing parameter and made fields properly optional