Fix validation
Add extra types