Make fields completely optional to pass tests