Adding Some Validation