Added validations and security tag