Mods for validation

Some changes for validation