Added content check
Added refactored HasContent