Add type constraint validation
Add nil validation