Added delimter detection