Added extra validation for non strongly typed classes