Added missing syntactic sugar

- Added objects for Number and Or
- Renamed Or.opt to Or.optional