Added all optional fields to all calls