Adding validation in the API side.. still need to add some code