Added word boundaries