Feature/validate api