Better validation and specs