Add rudimentary validations