Added content parsing and checking