Added data validation to some plugins