Add word boundary option