Some Validation Added