Update optinal gem
Optional fields to be an Option type
Merge branch 'feature/optional'