Add validation handling
Update coverage