Added content type detection