#389 Updated validation for SIS