Add Validations and Fixed Syntax