Removed type checking; added validating