Added data validation and novell check