refactor usgin content model validation