Add validations and better car list