Added more validations, not ideal but good for something like this