Added a validation and a few specs.