use better syntax for optional fields