Added validation

Signed-off-by: Kleon Kita