Added typing help for the validation
Adjusted grammar and included some validation mechanismns