First validator version
Fixed include paths