Added specs and model validation