Implemented Some Data Validation