Improved content check