Added validations
Update TODO