diff --git a/src/components/NotePostForm.tsx b/src/components/NotePostForm.tsx
index 0a95a2c..e8dd011 100644
--- a/src/components/NotePostForm.tsx
+++ b/src/components/NotePostForm.tsx
@@ -11,9 +11,8 @@ import { Event as NostrEvent } from 'nostr-tools';
 import EmojiPicker from '@/components/EmojiPicker';
 import UserNameDisplay from '@/components/UserDisplayName';
 import useConfig from '@/core/useConfig';
-import { useHandleCommand } from '@/hooks/useCommandBus';
 import usePersistStatus from '@/hooks/usePersistStatus';
-import eventWrapper from '@/nostr/event';
+import { textNote } from '@/nostr/event';
 import parseTextNote, { ParsedTextNote } from '@/nostr/parseTextNote';
 import useCommands, { PublishTextNoteParams } from '@/nostr/useCommands';
 import usePubkey from '@/nostr/usePubkey';
@@ -112,7 +111,7 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
   const getPubkey = usePubkey();
   const commands = useCommands();
 
-  const replyTo = () => props.replyTo && eventWrapper(props.replyTo);
+  const replyTo = () => props.replyTo && textNote(props.replyTo);
   const mode = () => props.mode ?? 'normal';
 
   const publishTextNoteMutation = createMutation({
@@ -156,11 +155,11 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
     },
   });
 
-  const mentionedPubkeysWithoutMe = createMemo(() => {
+  const taggedPubkeysWithoutMe = createMemo(() => {
     const p = getPubkey();
     return (
       replyTo()
-        ?.mentionedPubkeys()
+        ?.taggedPubkeys()
         ?.filter((pubkey) => pubkey !== p) ?? []
     );
   });
@@ -171,7 +170,7 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
       // 返信先を先頭に
       props.replyTo.pubkey,
       // その他の返信先
-      ...mentionedPubkeysWithoutMe(),
+      ...taggedPubkeysWithoutMe(),
     ]);
   });
 
@@ -203,7 +202,7 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
     const formattedContent = format(parsed);
     const emojiTags = buildEmojiTags(emojis);
 
-    let textNote: PublishTextNoteParams = {
+    let textNoteParams: PublishTextNoteParams = {
       relayUrls: config().relayUrls,
       pubkey,
       content: formattedContent,
@@ -215,8 +214,8 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
     };
 
     if (replyTo() != null) {
-      textNote = {
-        ...textNote,
+      textNoteParams = {
+        ...textNoteParams,
         notifyPubkeys: uniq([
           ...notifyPubkeys(),
           ...pubkeyReferences, // 本文中の公開鍵（npub)
@@ -226,12 +225,12 @@ const NotePostForm: Component<NotePostFormProps> = (props) => {
       };
     }
     if (contentWarning()) {
-      textNote = {
-        ...textNote,
+      textNoteParams = {
+        ...textNoteParams,
         contentWarning: contentWarningReason(),
       };
     }
-    publishTextNoteMutation.mutate(textNote);
+    publishTextNoteMutation.mutate(textNoteParams);
     close();
   };
 
diff --git a/src/components/column/FollwingColumn.tsx b/src/components/column/FollwingColumn.tsx
index e3d50c4..dfcc495 100644
--- a/src/components/column/FollwingColumn.tsx
+++ b/src/components/column/FollwingColumn.tsx
@@ -10,7 +10,7 @@ import Timeline from '@/components/timeline/Timeline';
 import { FollowingColumnType } from '@/core/column';
 import { applyContentFilter } from '@/core/contentFilter';
 import useConfig from '@/core/useConfig';
-import { useFollowings } from '@/nostr/useBatchedEvents';
+import useFollowings from '@/nostr/useFollowings';
 import useSubscription from '@/nostr/useSubscription';
 import epoch from '@/utils/epoch';
 
diff --git a/src/components/event/EventDisplay.tsx b/src/components/event/EventDisplay.tsx
index 8ada45d..b83dd31 100644
--- a/src/components/event/EventDisplay.tsx
+++ b/src/components/event/EventDisplay.tsx
@@ -2,7 +2,7 @@ import { Switch, Match, Component } from 'solid-js';
 
 import { Kind, type Event as NostrEvent } from 'nostr-tools';
 
-import ChannelInfo from '@/components/event/ChannelInfo';
+// import ChannelInfo from '@/components/event/ChannelInfo';
 // eslint-disable-next-line import/no-cycle
 import Repost from '@/components/event/Repost';
 // eslint-disable-next-line import/no-cycle
diff --git a/src/components/event/LongFormContent.tsx b/src/components/event/LongFormContent.tsx
index d1afeff..fa679dc 100644
--- a/src/components/event/LongFormContent.tsx
+++ b/src/components/event/LongFormContent.tsx
@@ -3,24 +3,14 @@ import { Component } from 'solid-js';
 import DocumentText from 'heroicons/24/outline/document-text.svg';
 import { Kind, Event as NostrEvent } from 'nostr-tools';
 
-import eventWrapper from '@/nostr/event';
+import { genericEvent } from '@/nostr/event';
 
 export type LongFormContentProps = {
   event: NostrEvent;
 };
 
 const LongFormContent: Component<LongFormContentProps> = (props) => {
-  const event = () => eventWrapper(props.event);
-  const getMeta = (name: string) => {
-    const tags = event().findTagsByName(name);
-    if (tags.length === 0) return null;
-    const [, lastTagValue] = tags[tags.length - 1];
-    return lastTagValue;
-  };
-  const title = () => getMeta('title');
-  // const imageUrl = () => getMeta('image');
-  // const summary = () => getMeta('summary');
-  // const publishdAt = () => getMeta('published_at');
+  // const event = () => genericEvent(props.event);
 
   return (
     <button class="flex flex-col gap-1 px-1">
@@ -28,7 +18,7 @@ const LongFormContent: Component<LongFormContentProps> = (props) => {
         <span class="inline-block h-4 w-4 text-purple-400">
           <DocumentText />
         </span>
-        <span>{title()}</span>
+        <span>TODO</span>
       </div>
     </button>
   );
diff --git a/src/components/event/Reaction.tsx b/src/components/event/Reaction.tsx
index 421cc29..9bed217 100644
--- a/src/components/event/Reaction.tsx
+++ b/src/components/event/Reaction.tsx
@@ -7,7 +7,7 @@ import TextNoteDisplay from '@/components/event/textNote/TextNoteDisplay';
 import UserDisplayName from '@/components/UserDisplayName';
 import useConfig from '@/core/useConfig';
 import useModalState from '@/hooks/useModalState';
-import eventWrapper from '@/nostr/event';
+import { genericEvent } from '@/nostr/event';
 import useEvent from '@/nostr/useEvent';
 import useProfile from '@/nostr/useProfile';
 import ensureNonNull from '@/utils/ensureNonNull';
@@ -19,7 +19,7 @@ type ReactionProps = {
 const Reaction: Component<ReactionProps> = (props) => {
   const { shouldMuteEvent } = useConfig();
   const { showProfile } = useModalState();
-  const event = () => eventWrapper(props.event);
+  const event = () => genericEvent(props.event);
   const eventId = () => event().lastTaggedEventId();
 
   const { profile } = useProfile(() => ({
diff --git a/src/components/event/Repost.tsx b/src/components/event/Repost.tsx
index e32ba06..ff80f9c 100644
--- a/src/components/event/Repost.tsx
+++ b/src/components/event/Repost.tsx
@@ -9,7 +9,7 @@ import EventDisplayById from '@/components/event/EventDisplayById';
 import UserDisplayName from '@/components/UserDisplayName';
 import useFormatDate from '@/hooks/useFormatDate';
 import useModalState from '@/hooks/useModalState';
-import eventWrapper from '@/nostr/event';
+import { genericEvent } from '@/nostr/event';
 
 export type RepostProps = {
   event: NostrEvent;
@@ -18,7 +18,7 @@ export type RepostProps = {
 const Repost: Component<RepostProps> = (props) => {
   const { showProfile } = useModalState();
   const formatDate = useFormatDate();
-  const event = createMemo(() => eventWrapper(props.event));
+  const event = createMemo(() => genericEvent(props.event));
   const eventId = () => event().lastTaggedEventId();
 
   return (
diff --git a/src/components/event/textNote/ContentWarningDisplay.tsx b/src/components/event/textNote/ContentWarningDisplay.tsx
index 0a798c0..37f1d9a 100644
--- a/src/components/event/textNote/ContentWarningDisplay.tsx
+++ b/src/components/event/textNote/ContentWarningDisplay.tsx
@@ -1,6 +1,6 @@
 import { createSignal, type Component, type JSX, Show } from 'solid-js';
 
-import { ContentWarning } from '@/nostr/event';
+import { ContentWarning } from '@/nostr/event/TextNote';
 
 export type ContentWarningDisplayProps = {
   contentWarning: ContentWarning;
diff --git a/src/components/event/textNote/TextNoteContentDisplay.tsx b/src/components/event/textNote/TextNoteContentDisplay.tsx
index 60f4ba4..97055f6 100644
--- a/src/components/event/textNote/TextNoteContentDisplay.tsx
+++ b/src/components/event/textNote/TextNoteContentDisplay.tsx
@@ -4,6 +4,7 @@ import { Kind, Event as NostrEvent } from 'nostr-tools';
 
 // eslint-disable-next-line import/no-cycle
 import EventDisplayById from '@/components/event/EventDisplayById';
+// import ParameterizedReplaceableEventDisplayById from '@/components/event/ParameterizedReplaceableEventDisplayById';
 import ImageDisplay from '@/components/event/textNote/ImageDisplay';
 import MentionedEventDisplay from '@/components/event/textNote/MentionedEventDisplay';
 import MentionedUserDisplay from '@/components/event/textNote/MentionedUserDisplay';
@@ -12,8 +13,8 @@ import SafeLink from '@/components/utils/SafeLink';
 import { createSearchColumn } from '@/core/column';
 import useConfig from '@/core/useConfig';
 import { useRequestCommand } from '@/hooks/useCommandBus';
-import eventWrapper from '@/nostr/event';
-import parseTextNote, { resolveTagReference, type ParsedTextNoteNode } from '@/nostr/parseTextNote';
+import { textNote } from '@/nostr/event';
+import parseTextNote, { type ParsedTextNoteNode } from '@/nostr/parseTextNote';
 import { isImageUrl } from '@/utils/imageUrl';
 
 export type TextNoteContentDisplayProps = {
@@ -26,7 +27,7 @@ const TextNoteContentDisplay = (props: TextNoteContentDisplayProps) => {
 
   const request = useRequestCommand();
 
-  const event = () => eventWrapper(props.event);
+  const event = () => textNote(props.event);
 
   const addHashTagColumn = (query: string) => {
     saveColumn(createSearchColumn({ query }));
@@ -34,7 +35,7 @@ const TextNoteContentDisplay = (props: TextNoteContentDisplayProps) => {
   };
 
   return (
-    <For each={parseTextNote(props.event.content)}>
+    <For each={event().parsed()}>
       {(item: ParsedTextNoteNode) => {
         if (item.type === 'PlainText') {
           return <span>{item.content}</span>;
@@ -53,7 +54,7 @@ const TextNoteContentDisplay = (props: TextNoteContentDisplayProps) => {
           return <SafeLink class="text-blue-500 underline" href={item.content} />;
         }
         if (item.type === 'TagReference') {
-          const resolved = resolveTagReference(item, props.event);
+          const resolved = event().resolveTagReference(item);
           if (resolved == null) {
             return <span>{item.content}</span>;
           }
diff --git a/src/components/event/textNote/TextNoteDisplay.tsx b/src/components/event/textNote/TextNoteDisplay.tsx
index 8588dee..ab7a3d6 100644
--- a/src/components/event/textNote/TextNoteDisplay.tsx
+++ b/src/components/event/textNote/TextNoteDisplay.tsx
@@ -21,7 +21,7 @@ import { useTimelineContext } from '@/components/timeline/TimelineContext';
 import useConfig from '@/core/useConfig';
 import useFormatDate from '@/hooks/useFormatDate';
 import useModalState from '@/hooks/useModalState';
-import eventWrapper from '@/nostr/event';
+import { textNote } from '@/nostr/event';
 import useCommands from '@/nostr/useCommands';
 import useProfile from '@/nostr/useProfile';
 import usePubkey from '@/nostr/usePubkey';
@@ -100,7 +100,7 @@ const TextNoteDisplay: Component<TextNoteDisplayProps> = (props) => {
   const [showOverflow, setShowOverflow] = createSignal(false);
   const [overflow, setOverflow] = createSignal(false);
 
-  const event = createMemo(() => eventWrapper(props.event));
+  const event = createMemo(() => textNote(props.event));
 
   const embedding = () => props.embedding ?? true;
   const actions = () => props.actions ?? true;
@@ -197,7 +197,7 @@ const TextNoteDisplay: Component<TextNoteDisplayProps> = (props) => {
       content: () => 'JSONとしてコピー',
       onSelect: () => {
         navigator.clipboard
-          .writeText(JSON.stringify(props.event))
+          .writeText(JSON.stringify(props.event, null, 2))
           .catch((err) => window.alert(err));
       },
     },
@@ -232,13 +232,22 @@ const TextNoteDisplay: Component<TextNoteDisplayProps> = (props) => {
   });
 
   const showReplyEvent = (): string | undefined => {
-    const replyingToEvent = event().replyingToEvent();
-    if (
-      embedding() &&
-      replyingToEvent != null &&
-      !event().containsEventMentionIndex(replyingToEvent.index)
-    ) {
-      return replyingToEvent.id;
+    if (embedding()) {
+      const replyingToEvent = event().replyingToEvent();
+
+      if (replyingToEvent != null && !event().containsEventMention(replyingToEvent.id)) {
+        return replyingToEvent.id;
+      }
+
+      const rootEvent = event().rootEvent();
+
+      if (
+        replyingToEvent == null &&
+        rootEvent != null &&
+        !event().containsEventMention(rootEvent.id)
+      ) {
+        return rootEvent.id;
+      }
     }
     return undefined;
   };
@@ -360,9 +369,9 @@ const TextNoteDisplay: Component<TextNoteDisplayProps> = (props) => {
                 </div>
               )}
             </Show>
-            <Show when={event().mentionedPubkeys().length > 0}>
+            <Show when={event().taggedPubkeys().length > 0}>
               <div class="text-xs">
-                <For each={event().mentionedPubkeys()}>
+                <For each={event().taggedPubkeys()}>
                   {(replyToPubkey: string) => (
                     <button
                       class="pr-1 text-blue-500 hover:underline"
diff --git a/src/components/modal/ProfileEdit.tsx b/src/components/modal/ProfileEdit.tsx
index cc09be7..e7aee71 100644
--- a/src/components/modal/ProfileEdit.tsx
+++ b/src/components/modal/ProfileEdit.tsx
@@ -7,8 +7,9 @@ import omitBy from 'lodash/omitBy';
 
 import BasicModal from '@/components/modal/BasicModal';
 import useConfig from '@/core/useConfig';
-import { Profile, useProfile } from '@/nostr/useBatchedEvents';
+import { Profile } from '@/nostr/event/Profile';
 import useCommands from '@/nostr/useCommands';
+import { useProfile } from '@/nostr/useProfile';
 import usePubkey from '@/nostr/usePubkey';
 import ensureNonNull from '@/utils/ensureNonNull';
 import timeout from '@/utils/timeout';
diff --git a/src/components/timeline/TimelineContentDisplay.tsx b/src/components/timeline/TimelineContentDisplay.tsx
index c5fd932..48cdb25 100644
--- a/src/components/timeline/TimelineContentDisplay.tsx
+++ b/src/components/timeline/TimelineContentDisplay.tsx
@@ -6,17 +6,17 @@ import { Filter, Event as NostrEvent } from 'nostr-tools';
 import Timeline from '@/components/timeline/Timeline';
 import { type TimelineContent } from '@/components/timeline/TimelineContext';
 import useConfig from '@/core/useConfig';
-import eventWrapper from '@/nostr/event';
+import { textNote } from '@/nostr/event';
+import TextNote from '@/nostr/event/TextNote';
 import useSubscription from '@/nostr/useSubscription';
 
-const relatedEvents = (rawEvent: NostrEvent) => {
-  const event = () => eventWrapper(rawEvent);
-  const ids = [rawEvent.id];
+const relatedEvents = (event: TextNote) => {
+  const ids = [event.id];
 
-  const rootId = event().rootEvent()?.id;
+  const rootId = event.rootEvent()?.id;
   if (rootId != null) ids.push(rootId);
 
-  const replyId = event().replyingToEvent()?.id;
+  const replyId = event.replyingToEvent()?.id;
   if (replyId != null) ids.push(replyId);
 
   return uniq(ids);
@@ -25,10 +25,12 @@ const relatedEvents = (rawEvent: NostrEvent) => {
 const RepliesDisplay: Component<{ event: NostrEvent }> = (props) => {
   const { config } = useConfig();
 
+  const event = () => textNote(props.event);
+
   const { events } = useSubscription(() => ({
     relayUrls: config().relayUrls,
     filters: [
-      { kinds: [1], ids: relatedEvents(props.event), limit: 25 },
+      { kinds: [1], ids: relatedEvents(event()), limit: 25 },
       { kinds: [1], '#e': [props.event.id], limit: 25 } as Filter,
     ],
     limit: 200,
diff --git a/src/core/useConfig.ts b/src/core/useConfig.ts
index a1c1f83..88ff560 100644
--- a/src/core/useConfig.ts
+++ b/src/core/useConfig.ts
@@ -17,7 +17,7 @@ import {
   createStorageWithSerializer,
   createStoreWithStorage,
 } from '@/hooks/createSignalWithStorage';
-import eventWrapper from '@/nostr/event';
+import { genericEvent } from '@/nostr/event';
 
 export type CustomEmojiConfig = {
   shortcode: string;
@@ -181,10 +181,10 @@ const useConfig = (): UseConfig => {
   };
 
   const shouldMuteEvent = (event: NostrEvent) => {
-    const ev = eventWrapper(event);
+    const ev = genericEvent(event);
     return (
       isPubkeyMuted(event.pubkey) ||
-      ev.mentionedPubkeys().some(isPubkeyMuted) ||
+      ev.taggedPubkeys().some(isPubkeyMuted) ||
       (event.kind === Kind.Text && hasMutedKeyword(event))
     );
   };
diff --git a/src/nostr/event.ts b/src/nostr/event.ts
index 72139ea..b7d3e77 100644
--- a/src/nostr/event.ts
+++ b/src/nostr/event.ts
@@ -1,184 +1,12 @@
-import uniq from 'lodash/uniq';
 import { Kind, Event as NostrEvent } from 'nostr-tools';
-import { z } from 'zod';
 
-import { isImageUrl } from '@/utils/imageUrl';
+import GenericEvent from '@/nostr/event/GenericEvent';
+import TextNote from '@/nostr/event/TextNote';
 
-export type EventMarker = 'reply' | 'root' | 'mention';
-
-// NIP-10
-export type MarkedEventTag = {
-  id: string;
-  relayUrl?: string;
-  index: number;
-  marker?: EventMarker;
+export const genericEvent = (event: NostrEvent): GenericEvent => {
+  return new GenericEvent(event);
 };
 
-export type ContactPubkeyTag = {
-  pubkey: string;
-  relayUrl?: string;
-  petname?: string;
+export const textNote = (event: NostrEvent): TextNote => {
+  return new TextNote(event);
 };
-
-export type ContentWarning = {
-  contentWarning: boolean;
-  reason?: string;
-};
-
-const IdRegex = /^[0-9a-f]{64}$/;
-export const isValidId = (s: string): boolean => {
-  const result = typeof s === 'string' && s.length === 64 && IdRegex.test(s);
-  if (!result) console.warn('invalid id is ignored: ', s);
-  return result;
-};
-
-/*
-// TODO event validation and normalization
-const eventSchema = z.object({
-  id: z.string().length(64).regex(IdRegex),
-  pubkey: z.string().length(64).regex(IdRegex),
-  created_at: z.number().int(),
-  kind: z.number(),
-  tags: z.array(z.array(z.string())),
-  content: z.string(),
-});
-*/
-
-const EmojiTagSchema = z.tuple([
-  z.literal('emoji'),
-  z.string().regex(/^\w+$/, {
-    message: 'shortcode can includes only alpahnumeric characters and underscore',
-  }),
-  z.string().url(), // .refine(isImageUrl)
-]);
-
-export type EmojiTag = z.infer<typeof EmojiTagSchema>;
-
-const ensureSchema =
-  <T>(schema: z.Schema<T>) =>
-  (value: any): value is T =>
-    schema.safeParse(value).success;
-
-const eventWrapper = (event: NostrEvent) => {
-  let memoizedMarkedEventTags: MarkedEventTag[] | undefined;
-
-  return {
-    get rawEvent(): NostrEvent {
-      return event;
-    },
-    get id(): string {
-      return event.id;
-    },
-    get pubkey(): string {
-      return event.pubkey;
-    },
-    get createdAt(): number {
-      return event.created_at;
-    },
-    get content(): string {
-      return event.content;
-    },
-    get tags(): string[][] {
-      return event.tags;
-    },
-    createdAtAsDate(): Date {
-      return new Date(event.created_at * 1000);
-    },
-    pTags(): string[][] {
-      return event.tags.filter(([tagName, pubkey]) => tagName === 'p' && isValidId(pubkey));
-    },
-    eTags(): string[][] {
-      return event.tags.filter(([tagName, eventId]) => tagName === 'e' && isValidId(eventId));
-    },
-    emojiTags(): EmojiTag[] {
-      return event.tags.filter(ensureSchema(EmojiTagSchema));
-    },
-    findTagsByName(name: string): string[][] {
-      return event.tags.filter(([tagName]) => tagName === name);
-    },
-    taggedEventIds(): string[] {
-      return this.eTags().map(([, eventId]) => eventId);
-    },
-    lastTaggedEventId(): string | undefined {
-      // for compatibility. some clients include additional event ids for reaction (kind:7).
-      const ids = this.taggedEventIds();
-      if (ids.length === 0) return undefined;
-      return ids[ids.length - 1];
-    },
-    markedEventTags(): MarkedEventTag[] {
-      if (event.kind !== Kind.Text) throw new Error('kind should be 1');
-
-      if (memoizedMarkedEventTags != null) return memoizedMarkedEventTags;
-
-      // 'eTags' cannot be used here because it does not preserve originalIndex.
-      const events = event.tags
-        .map((tag, originalIndex) => [tag, originalIndex] as const)
-        .filter(([[tagName, eventId]]) => tagName === 'e' && isValidId(eventId));
-
-      // NIP-10: Positional "e" tags (DEPRECATED)
-      const positionToMarker = (marker: string, index: number): EventMarker | undefined => {
-        // NIP-10 is applied to only kind:1 text note.
-        if (event.kind !== 1) return undefined;
-        if (marker === 'root' || marker === 'reply' || marker === 'mention') return marker;
-        // One "e" tag
-        if (events.length === 1) return 'reply';
-        // Two "e" tags  or many "e" tags : first tag is root
-        if (index === 0) return 'root';
-        // Two "e" tags
-        if (events.length === 2) return 'reply';
-        // Many "e" tags
-        // The last one is reply.
-        if (index === events.length - 1) return 'reply';
-        // The rest are mentions.
-        return 'mention';
-      };
-
-      memoizedMarkedEventTags = events.map(
-        ([[, eventId, relayUrl, marker], originalIndex], eTagIndex) => ({
-          id: eventId,
-          relayUrl,
-          marker: positionToMarker(marker, eTagIndex),
-          index: originalIndex,
-        }),
-      );
-
-      return memoizedMarkedEventTags;
-    },
-    replyingToEvent(): MarkedEventTag | undefined {
-      return this.markedEventTags().find(({ marker }) => marker === 'reply');
-    },
-    rootEvent(): MarkedEventTag | undefined {
-      return this.markedEventTags().find(({ marker }) => marker === 'root');
-    },
-    mentionedEvents(): MarkedEventTag[] {
-      return this.markedEventTags().filter(({ marker }) => marker === 'mention');
-    },
-    mentionedPubkeys(): string[] {
-      return uniq(this.pTags().map(([, pubkey]) => pubkey));
-    },
-    contentWarning(): ContentWarning {
-      const tag = event.tags.find(([tagName]) => tagName === 'content-warning');
-      if (tag == null) return { contentWarning: false };
-
-      const reason = (tag[1]?.length ?? 0) > 0 ? tag[1] : undefined;
-      return { contentWarning: true, reason };
-    },
-    containsEventMention(eventId: string): boolean {
-      const tagIndex = event.tags.findIndex(([tagName, id]) => tagName === 'e' && id === eventId);
-      if (tagIndex < 0) return false;
-      return this.containsEventMentionIndex(tagIndex);
-    },
-    containsEventMentionIndex(index: number): boolean {
-      if (index < 0 || index >= event.tags.length) return false;
-      return event.content.includes(`#[${index}]`);
-    },
-    getEmojiUrl(shortcode: string): string | null {
-      const emojiTag = this.emojiTags().find(([, code]) => code === shortcode);
-      if (emojiTag == null) return null;
-      const [, , url] = emojiTag;
-      return url;
-    },
-  };
-};
-
-export default eventWrapper;
diff --git a/src/nostr/event/GenericEvent.ts b/src/nostr/event/GenericEvent.ts
new file mode 100644
index 0000000..3bb4adc
--- /dev/null
+++ b/src/nostr/event/GenericEvent.ts
@@ -0,0 +1,75 @@
+import uniq from 'lodash/uniq';
+import { Kind, Event as NostrEvent } from 'nostr-tools';
+
+import isValidId from '@/nostr/event/isValidId';
+
+export default class GenericEvent {
+  constructor(readonly rawEvent: NostrEvent) {}
+
+  get id(): string {
+    return this.rawEvent.id;
+  }
+
+  get sig(): string {
+    return this.rawEvent.sig;
+  }
+
+  get kind(): Kind {
+    return this.rawEvent.kind;
+  }
+
+  get pubkey(): string {
+    return this.rawEvent.pubkey;
+  }
+
+  get createdAt(): number {
+    return this.rawEvent.created_at;
+  }
+
+  get content(): string {
+    return this.rawEvent.content;
+  }
+
+  get tags(): string[][] {
+    return this.rawEvent.tags;
+  }
+
+  createdAtAsDate(): Date {
+    return new Date(this.rawEvent.created_at * 1000);
+  }
+
+  findTagsByName(name: string): string[][] {
+    return this.rawEvent.tags.filter(([tagName]) => tagName === name);
+  }
+
+  findFirstTagByName(name: string): string[] | undefined {
+    return this.rawEvent.tags.find(([tagName]) => tagName === name);
+  }
+
+  findLastTagByName(name: string): string[] | undefined {
+    return this.rawEvent.tags.findLast(([tagName]) => tagName === name);
+  }
+
+  pTags(): string[][] {
+    return this.rawEvent.tags.filter(([tagName, pubkey]) => tagName === 'p' && isValidId(pubkey));
+  }
+
+  eTags(): string[][] {
+    return this.rawEvent.tags.filter(([tagName, eventId]) => tagName === 'e' && isValidId(eventId));
+  }
+
+  taggedPubkeys(): string[] {
+    return uniq(this.pTags().map(([, pubkey]) => pubkey));
+  }
+
+  taggedEventIds(): string[] {
+    return this.eTags().map(([, eventId]) => eventId);
+  }
+
+  lastTaggedEventId(): string | undefined {
+    // for compatibility. some clients include additional event ids for reaction (kind:7).
+    const ids = this.taggedEventIds();
+    if (ids.length === 0) return undefined;
+    return ids[ids.length - 1];
+  }
+}
diff --git a/src/nostr/event/LongFormContent.ts b/src/nostr/event/LongFormContent.ts
new file mode 100644
index 0000000..5e0cc67
--- /dev/null
+++ b/src/nostr/event/LongFormContent.ts
@@ -0,0 +1,44 @@
+import { Event as NostrEvent, Kind } from 'nostr-tools';
+
+import GenericEvent from '@/nostr/event/GenericEvent';
+
+class LongFormContent extends GenericEvent {
+  constructor(rawEvent: NostrEvent) {
+    if (rawEvent.kind !== Kind.Article) {
+      throw new TypeError('kind should be 30023');
+    }
+    super(rawEvent);
+  }
+
+  #getMeta(tagName: string): string | null {
+    const tags = this.findTagsByName(tagName);
+    if (tags.length === 0) return null;
+    const [, value] = tags[0];
+    return value;
+  }
+
+  title(): string | null {
+    return this.#getMeta('title');
+  }
+
+  image(): string | null {
+    return this.#getMeta('image');
+  }
+
+  summary(): string | null {
+    return this.#getMeta('image');
+  }
+
+  publishedAt(): string | null {
+    return this.#getMeta('publishedAt');
+  }
+
+  publishedAtAsDate(): Date | null {
+    const publishedAt = this.publishedAt();
+    if (publishedAt == null) return null;
+
+    return new Date(parseInt(publishedAt, 10) * 1000);
+  }
+}
+
+export default LongFormContent;
diff --git a/src/nostr/event/Profile.ts b/src/nostr/event/Profile.ts
new file mode 100644
index 0000000..59ed361
--- /dev/null
+++ b/src/nostr/event/Profile.ts
@@ -0,0 +1,37 @@
+// TODO zodにする
+// deleted等の特殊なもの
+export type StandardProfile = {
+  name?: string;
+  about?: string;
+  // user's icon
+  picture?: string;
+  // user's banner image
+  banner?: string;
+  nip05?: string; // NIP-05
+  lud06?: string; // NIP-57
+  lud16?: string; // NIP-57
+};
+
+export type NonStandardProfile = {
+  display_name?: string;
+  website?: string;
+};
+
+export type Profile = StandardProfile & NonStandardProfile;
+
+export type ProfileWithOtherProperties = Profile & Record<string, any>;
+
+export const parseProfile = (content: string | null): Profile => {
+  if (content == null || content.length === 0) throw new TypeError('content is empty or null');
+  // TODO 大きすぎたりしないかどうか、JSONかどうかのチェック
+  return JSON.parse(content) as Profile;
+};
+
+export const safeParseProfile = (content: string | null): Profile | null => {
+  try {
+    return parseProfile(content);
+  } catch (err) {
+    console.warn('failed to parse profile (kind 0): ', err, content);
+    return null;
+  }
+};
diff --git a/src/nostr/event/TextNote.test.ts b/src/nostr/event/TextNote.test.ts
new file mode 100644
index 0000000..4e40ec6
--- /dev/null
+++ b/src/nostr/event/TextNote.test.ts
@@ -0,0 +1,261 @@
+import assert from 'assert';
+
+import { Kind, type Event as NostrEvent } from 'nostr-tools';
+import { describe, it } from 'vitest';
+
+import TextNote, { MarkedEventTag, markedEventTags } from '@/nostr/event/TextNote';
+import { TagReference } from '@/nostr/parseTextNote';
+
+describe('markedEventTags', () => {
+  it('should return an empty array if the event has no tags', () => {
+    const actual = markedEventTags([]);
+    const expected: MarkedEventTag[] = [];
+    assert.deepStrictEqual(actual, expected);
+  });
+  it('should return MarkedEventTags if the event has tags with markers', () => {
+    // the order of markers is not important
+    const given = [
+      ['e', '375ffd613e99b6359d9239b329f92bc8d19e4c164626567f68fd5112bfa5570b', '', 'mention'],
+      ['e', '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450', '', 'reply'],
+      ['e', '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9', '', 'root'],
+    ];
+    const actual = markedEventTags(given);
+    const expected: MarkedEventTag[] = [
+      {
+        id: '375ffd613e99b6359d9239b329f92bc8d19e4c164626567f68fd5112bfa5570b',
+        index: 0,
+        relayUrl: null,
+        marker: 'mention',
+      },
+      {
+        id: '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450',
+        index: 1,
+        relayUrl: null,
+        marker: 'reply',
+      },
+      {
+        id: '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9',
+        index: 2,
+        relayUrl: null,
+        marker: 'root',
+      },
+    ];
+    assert.deepStrictEqual(actual, expected);
+  });
+
+  it('should return a root MarkedEventTag if the event has a single e tag', () => {
+    const given = [['e', '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9', '']];
+    const actual = markedEventTags(given);
+    const expected: MarkedEventTag[] = [
+      {
+        id: '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9',
+        index: 0,
+        relayUrl: null,
+        marker: 'reply',
+      },
+    ];
+    assert.deepStrictEqual(actual, expected);
+  });
+
+  it('should return root and reply MarkedEventTag if the event has two e tags', () => {
+    const given = [
+      ['e', '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9', ''],
+      ['e', '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450', ''],
+    ];
+    const actual = markedEventTags(given);
+    const expected: MarkedEventTag[] = [
+      {
+        id: '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9',
+        index: 0,
+        relayUrl: null,
+        marker: 'root',
+      },
+      {
+        id: '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450',
+        index: 1,
+        relayUrl: null,
+        marker: 'reply',
+      },
+    ];
+    assert.deepStrictEqual(actual, expected);
+  });
+
+  it('should return root, mention and reply MarkedEventTags if the event has three e tags', () => {
+    const given = [
+      ['e', '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9', ''],
+      ['e', '375ffd613e99b6359d9239b329f92bc8d19e4c164626567f68fd5112bfa5570b', ''],
+      ['e', '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450', ''],
+    ];
+    const actual = markedEventTags(given);
+    const expected: MarkedEventTag[] = [
+      {
+        id: '59cd96d24acd0679080679330a06ae9dcb5026ba080528fb93762c49050be8c9',
+        index: 0,
+        relayUrl: null,
+        marker: 'root',
+      },
+      {
+        id: '375ffd613e99b6359d9239b329f92bc8d19e4c164626567f68fd5112bfa5570b',
+        index: 1,
+        relayUrl: null,
+        marker: 'mention',
+      },
+      {
+        id: '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450',
+        index: 2,
+        relayUrl: null,
+        marker: 'reply',
+      },
+    ];
+    assert.deepStrictEqual(actual, expected);
+  });
+
+  it('should ignore invalid event id', () => {
+    const given = [
+      ['e', 'note1xa0l6cf7nxmrt8vj8xejn7ftergeunqkgcn9vlmgl4g390a92u9snvtljd', '', 'root'],
+    ];
+    const actual = markedEventTags(given);
+    const expected: MarkedEventTag[] = [];
+    assert.deepStrictEqual(actual, expected);
+  });
+});
+
+describe('TextNote', () => {
+  describe('constructor', () => {
+    it('should throws an exception if non-kind:1 event is given', () => {
+      assert.throws(() => {
+        const textnote = new TextNote({
+          id: '',
+          kind: Kind.Metadata,
+          content: '',
+          created_at: 0,
+          pubkey: '',
+          sig: '',
+          tags: [],
+        });
+        assert.deepStrictEqual(textnote, null);
+      });
+    });
+  });
+
+  describe('#containsEventNote', () => {
+    it('should return true if content of the event includes a NIP-19-styled note ID', () => {
+      const textnote = new TextNote({
+        id: '',
+        kind: Kind.Text,
+        content: 'nostr:note1qpwq08jv0sgrz68qev6eyu9vj6n2gmjl7n8g73jruzp37mguy3gq8d7asa',
+        created_at: 0,
+        pubkey: '',
+        sig: '',
+        tags: [],
+      });
+      assert(
+        textnote.containsEventNote(
+          '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450',
+        ),
+      );
+    });
+
+    it('should return true if content of the event includes a NIP-19-styled nevent ID', () => {
+      const textnote = new TextNote({
+        id: '',
+        kind: Kind.Text,
+        content: 'nostr:nevent1qqsttdc4rmxn8fqmk9s6823fqvpcmlm8ry6dmtu4m2snv0cm9sv70kq6urpy5',
+        created_at: 0,
+        pubkey: '',
+        sig: '',
+        tags: [],
+      });
+      assert(
+        textnote.containsEventNote(
+          'b5b7151ecd33a41bb161a3aa2903038dff671934ddaf95daa1363f1b2c19e7d8',
+        ),
+      );
+    });
+  });
+
+  describe('#contentWarning', () => {
+    it('should return a reply MarkedEventTag if the event has a reply tag', () => {
+      const textnote = new TextNote({
+        id: '',
+        kind: Kind.Text,
+        content: '',
+        created_at: 0,
+        pubkey: '',
+        sig: '',
+        tags: [
+          ['e', '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450', '', 'reply'],
+        ],
+      });
+      const expected = {
+        id: '005c079e4c7c103168e0cb359270ac96a6a46e5ff4ce8f4643e0831f6d1c2450',
+        index: 0,
+        marker: 'reply',
+        relayUrl: null,
+      };
+      assert.deepStrictEqual(textnote.replyingToEvent(), expected);
+    });
+  });
+
+  describe('#resolveTagReference', () => {
+    it('should resolve a tag reference refers a user', () => {
+      const tagReference: TagReference = {
+        type: 'TagReference',
+        tagIndex: 1,
+        content: '#[1]',
+      };
+      const dummyEvent: NostrEvent = {
+        id: '',
+        sig: '',
+        kind: 1,
+        content: '#[1]',
+        tags: [
+          ['p', '9366708117c4a7edf9178acdce538c95059b9eb3394808cdd90564094172d972'],
+          ['p', '80d3a41d8a00679c0105faac2cdf7643c9ba26835cff096bf7f9c7a0eee8c8fc'],
+        ],
+        created_at: 1678377182,
+        pubkey: '9366708117c4a7edf9178acdce538c95059b9eb3394808cdd90564094172d972',
+      };
+      const textNote = new TextNote(dummyEvent);
+      const result = textNote.resolveTagReference(tagReference);
+      const expected = {
+        type: 'MentionedUser',
+        tagIndex: 1,
+        content: '#[1]',
+        pubkey: '80d3a41d8a00679c0105faac2cdf7643c9ba26835cff096bf7f9c7a0eee8c8fc',
+      };
+
+      assert.deepStrictEqual(result, expected);
+    });
+
+    it('should resolve a tag reference refers an other text note', () => {
+      const tagReference: TagReference = {
+        type: 'TagReference',
+        tagIndex: 1,
+        content: '#[1]',
+      };
+      const dummyEvent: NostrEvent = {
+        id: '',
+        sig: '',
+        kind: 1,
+        content: '',
+        tags: [
+          ['p', '80d3a41d8a00679c0105faac2cdf7643c9ba26835cff096bf7f9c7a0eee8c8fc'],
+          ['e', 'b9cefcb857fa487d5794156e85b30a7f98cb21721040631210262091d86ff6f2', '', 'reply'],
+        ],
+        created_at: 1678377182,
+        pubkey: '9366708117c4a7edf9178acdce538c95059b9eb3394808cdd90564094172d972',
+      };
+      const textNote = new TextNote(dummyEvent);
+      const result = textNote.resolveTagReference(tagReference);
+      const expected = {
+        type: 'MentionedEvent',
+        tagIndex: 1,
+        marker: 'reply',
+        content: '#[1]',
+        eventId: 'b9cefcb857fa487d5794156e85b30a7f98cb21721040631210262091d86ff6f2',
+      };
+      assert.deepStrictEqual(result, expected);
+    });
+  });
+});
diff --git a/src/nostr/event/TextNote.ts b/src/nostr/event/TextNote.ts
new file mode 100644
index 0000000..491c1cb
--- /dev/null
+++ b/src/nostr/event/TextNote.ts
@@ -0,0 +1,198 @@
+import { Event as NostrEvent, Kind } from 'nostr-tools';
+import { z } from 'zod';
+
+import GenericEvent from '@/nostr/event/GenericEvent';
+import isValidId from '@/nostr/event/isValidId';
+import parseTextNote, {
+  MentionedEvent,
+  MentionedUser,
+  ParsedTextNote,
+  TagReference,
+} from '@/nostr/parseTextNote';
+import ensureSchema from '@/utils/ensureSchema';
+
+export type EventMarker = 'reply' | 'root' | 'mention';
+
+// NIP-10
+export type MarkedEventTag = {
+  id: string;
+  relayUrl?: string | null;
+  index: number;
+  marker?: EventMarker;
+};
+
+export type ContactPubkeyTag = {
+  pubkey: string;
+  relayUrl?: string;
+  petname?: string;
+};
+
+export type ContentWarning = {
+  contentWarning: boolean;
+  reason?: string;
+};
+
+const EmojiTagSchema = z.tuple([
+  z.literal('emoji'),
+  z.string().regex(/^\w+$/, {
+    message: 'shortcode can includes only alpahnumeric characters and underscore',
+  }),
+  z.string().url(), // .refine(isImageUrl)
+]);
+
+export type EmojiTag = z.infer<typeof EmojiTagSchema>;
+
+export const markedEventTags = (tags: string[][]): MarkedEventTag[] => {
+  // 'eTags' cannot be used here because it does not preserve originalIndex.
+  const events = tags
+    .map((tag, originalIndex) => [tag, originalIndex] as const)
+    .filter(([[tagName, eventId]]) => tagName === 'e' && isValidId(eventId));
+
+  // NIP-10: Positional "e" tags (DEPRECATED)
+  const positionToMarker = (marker: string, index: number): EventMarker | undefined => {
+    // NIP-10 styled marker
+    if (marker === 'root' || marker === 'reply' || marker === 'mention') return marker;
+    // One "e" tag
+    if (events.length === 1) return 'reply';
+    // Two "e" tags  or many "e" tags : first tag is root
+    if (index === 0) return 'root';
+    // Two "e" tags
+    if (events.length === 2) return 'reply';
+    // Many "e" tags
+    // The last one is reply.
+    if (index === events.length - 1) return 'reply';
+    // The rest are mentions.
+    return 'mention';
+  };
+
+  return events.map(([[, eventId, relayUrl, marker], originalIndex], eTagIndex) => ({
+    id: eventId,
+    relayUrl: (relayUrl?.length ?? 0) > 0 ? relayUrl : null,
+    marker: positionToMarker(marker, eTagIndex),
+    index: originalIndex,
+  }));
+};
+
+export default class TextNote extends GenericEvent {
+  #memoizedMarkedEventTags: MarkedEventTag[] | undefined;
+
+  #memoizedParsed: ParsedTextNote | undefined;
+
+  constructor(rawEvent: NostrEvent) {
+    if (rawEvent.kind !== Kind.Text) {
+      throw new TypeError('kind should be 1');
+    }
+    super(rawEvent);
+  }
+
+  parsed(): ParsedTextNote {
+    if (this.#memoizedParsed != null) {
+      return this.#memoizedParsed;
+    }
+    this.#memoizedParsed = parseTextNote(this.content);
+    return this.#memoizedParsed;
+  }
+
+  // TODO パーサー側の関心事な気がするのでどこかで移したい
+  resolveTagReference({
+    tagIndex,
+    content,
+  }: TagReference): MentionedUser | MentionedEvent | undefined {
+    const tag = this.rawEvent.tags[tagIndex];
+    if (tag == null) return undefined;
+
+    const tagName = tag[0];
+
+    if (tagName === 'p' && isValidId(tag[1])) {
+      return {
+        type: 'MentionedUser',
+        tagIndex,
+        content,
+        pubkey: tag[1],
+      } satisfies MentionedUser;
+    }
+
+    if (tagName === 'e' && isValidId(tag[1])) {
+      const mention = this.markedEventTags().find((ev) => ev.index === tagIndex);
+
+      return {
+        type: 'MentionedEvent',
+        tagIndex,
+        content,
+        eventId: tag[1],
+        marker: mention?.marker,
+      } satisfies MentionedEvent;
+    }
+
+    return undefined;
+  }
+
+  markedEventTags(): MarkedEventTag[] {
+    if (this.#memoizedMarkedEventTags != null) {
+      return this.#memoizedMarkedEventTags;
+    }
+    this.#memoizedMarkedEventTags = markedEventTags(this.tags);
+    return this.#memoizedMarkedEventTags;
+  }
+
+  replyingToEvent(): MarkedEventTag | undefined {
+    return this.markedEventTags().find(({ marker }) => marker === 'reply');
+  }
+
+  rootEvent(): MarkedEventTag | undefined {
+    return this.markedEventTags().find(({ marker }) => marker === 'root');
+  }
+
+  mentionedEvents(): MarkedEventTag[] {
+    return this.markedEventTags().filter(({ marker }) => marker === 'mention');
+  }
+
+  contentWarning(): ContentWarning {
+    const tag = this.findLastTagByName('content-warning');
+    if (tag == null) return { contentWarning: false };
+
+    const reason = (tag[1]?.length ?? 0) > 0 ? tag[1] : undefined;
+    return { contentWarning: true, reason };
+  }
+
+  /**
+   * containsEventMention returns true if the content includes event
+   */
+  containsEventMention(eventId: string): boolean {
+    const tagIndex = this.rawEvent.tags.findIndex(
+      ([tagName, id]) => tagName === 'e' && id === eventId,
+    );
+    return this.containsEventNote(eventId) || this.containsEventMentionIndex(tagIndex);
+  }
+
+  /**
+   * containsEventMentionIndex returns true if the content includes NIP-08 style mention.
+   */
+  containsEventMentionIndex(index: number): boolean {
+    if (index < 0 || index >= this.rawEvent.tags.length) return false;
+    return this.parsed().some((node) => node.type === 'TagReference' && node.tagIndex === index);
+  }
+
+  /**
+   * containsEventNote returns true if the content includes NIP-19 event mention.
+   */
+  containsEventNote(eventId: string): boolean {
+    return this.parsed().some(
+      (node) =>
+        node.type === 'Bech32Entity' &&
+        ((node.data.type === 'nevent' && node.data.data.id === eventId) ||
+          (node.data.type === 'note' && node.data.data === eventId)),
+    );
+  }
+
+  emojiTags(): EmojiTag[] {
+    return this.rawEvent.tags.filter(ensureSchema(EmojiTagSchema));
+  }
+
+  getEmojiUrl(shortcode: string): string | null {
+    const emojiTag = this.emojiTags().find(([, code]) => code === shortcode);
+    if (emojiTag == null) return null;
+    const [, , url] = emojiTag;
+    return url;
+  }
+}
diff --git a/src/nostr/event.test.ts b/src/nostr/event/isValidId.test.ts
similarity index 93%
rename from src/nostr/event.test.ts
rename to src/nostr/event/isValidId.test.ts
index 10cb4ba..6bc84c3 100644
--- a/src/nostr/event.test.ts
+++ b/src/nostr/event/isValidId.test.ts
@@ -2,7 +2,7 @@ import assert from 'assert';
 
 import { describe, it } from 'vitest';
 
-import { isValidId } from '@/nostr/event';
+import isValidId from '@/nostr/event/isValidId';
 
 describe('isValidId', () => {
   it.each([
diff --git a/src/nostr/event/isValidId.ts b/src/nostr/event/isValidId.ts
new file mode 100644
index 0000000..7152eb1
--- /dev/null
+++ b/src/nostr/event/isValidId.ts
@@ -0,0 +1,9 @@
+const IdRegex = /^[0-9a-f]{64}$/;
+
+const isValidId = (s: string): boolean => {
+  const result = typeof s === 'string' && s.length === 64 && IdRegex.test(s);
+  if (!result) console.warn('invalid id is ignored: ', s);
+  return result;
+};
+
+export default isValidId;
diff --git a/src/nostr/parseTextNote.test.ts b/src/nostr/parseTextNote.test.ts
index 74f031c..a66428b 100644
--- a/src/nostr/parseTextNote.test.ts
+++ b/src/nostr/parseTextNote.test.ts
@@ -3,11 +3,7 @@ import assert from 'assert';
 import { type Event as NostrEvent } from 'nostr-tools';
 import { describe, it } from 'vitest';
 
-import parseTextNote, {
-  resolveTagReference,
-  type ParsedTextNoteNode,
-  TagReference,
-} from '@/nostr/parseTextNote';
+import parseTextNote, { type ParsedTextNoteNode, TagReference } from '@/nostr/parseTextNote';
 
 describe('parseTextNote', () => {
   /*
@@ -225,63 +221,3 @@ describe('parseTextNote', () => {
     },
   );
 });
-
-describe('resolveTagReference', () => {
-  it('should resolve a tag reference refers a user', () => {
-    const tagReference: TagReference = {
-      type: 'TagReference',
-      tagIndex: 1,
-      content: '#[1]',
-    };
-    const dummyEvent: NostrEvent = {
-      id: '',
-      sig: '',
-      kind: 1,
-      content: '#[1]',
-      tags: [
-        ['p', '9366708117c4a7edf9178acdce538c95059b9eb3394808cdd90564094172d972'],
-        ['p', '80d3a41d8a00679c0105faac2cdf7643c9ba26835cff096bf7f9c7a0eee8c8fc'],
-      ],
-      created_at: 1678377182,
-      pubkey: '9366708117c4a7edf9178acdce538c95059b9eb3394808cdd90564094172d972',
-    };
-    const result = resolveTagReference(tagReference, dummyEvent);
-    const expected = {
-      type: 'MentionedUser',
-      tagIndex: 1,
-      content: '#[1]',
-      pubkey: '80d3a41d8a00679c0105faac2cdf7643c9ba26835cff096bf7f9c7a0eee8c8fc',
-    };
-
-    assert.deepStrictEqual(result, expected);
-  });
-
-  it('should resolve a tag reference refers an other text note', () => {
-    const tagReference: TagReference = {
-      type: 'TagReference',
-      tagIndex: 1,
-      content: '#[1]',
-    };
-    const dummyEvent: NostrEvent = {
-      id: '',
-      sig: '',
-      kind: 1,
-      content: '',
-      tags: [
-        ['p', '80d3a41d8a00679c0105faac2cdf7643c9ba26835cff096bf7f9c7a0eee8c8fc'],
-        ['e', 'b9cefcb857fa487d5794156e85b30a7f98cb21721040631210262091d86ff6f2', '', 'reply'],
-      ],
-      created_at: 1678377182,
-      pubkey: '9366708117c4a7edf9178acdce538c95059b9eb3394808cdd90564094172d972',
-    };
-    const result = resolveTagReference(tagReference, dummyEvent);
-    const expected = {
-      type: 'MentionedEvent',
-      tagIndex: 1,
-      marker: 'reply',
-      content: '#[1]',
-      eventId: 'b9cefcb857fa487d5794156e85b30a7f98cb21721040631210262091d86ff6f2',
-    };
-    assert.deepStrictEqual(result, expected);
-  });
-});
diff --git a/src/nostr/parseTextNote.ts b/src/nostr/parseTextNote.ts
index 0409d03..a7d342b 100644
--- a/src/nostr/parseTextNote.ts
+++ b/src/nostr/parseTextNote.ts
@@ -1,9 +1,5 @@
 import { nip19, type Event as NostrEvent } from 'nostr-tools';
-
-import eventWrapper, { isValidId } from '@/nostr/event';
-
-type ProfilePointer = nip19.ProfilePointer;
-type EventPointer = nip19.EventPointer;
+import { DecodeResult } from 'nostr-tools/lib/nip19';
 
 const { decode } = nip19;
 
@@ -26,10 +22,7 @@ export type TagReference = {
 export type Bech32Entity = {
   type: 'Bech32Entity';
   content: string;
-  data:
-    | { type: 'npub' | 'note'; data: string }
-    | { type: 'nprofile'; data: ProfilePointer }
-    | { type: 'nevent'; data: EventPointer };
+  data: DecodeResult;
   isNIP19: boolean;
 };
 
@@ -75,9 +68,8 @@ const urlRegex =
   /(?<url>(?:https?|wss?):\/\/[-a-zA-Z0-9.]+(:\d{1,5})?(?:\/[-[\]~!$&'()*+.,:;@&=%\w]+|\/)*(?:\?[-[\]~!$&'()*+.,/:;%@&=\w?]+)?(?:#[-[\]~!$&'()*+.,/:;%@\w&=?#]+)?)/g;
 const tagRefRegex = /(?:#\[(?<idx>\d+)\])/g;
 // raw NIP-19 codes, NIP-21 links (NIP-27)
-// nrelay and naddr is not supported by nostr-tools
 const mentionRegex =
-  /(?<mention>(?<nip19>nostr:)?(?<bech32>(?:npub|note|nprofile|nevent)1[ac-hj-np-z02-9]+))/gi;
+  /(?<mention>(?<nip19>nostr:)?(?<bech32>(?:npub|note|nprofile|nevent|naddr|nrelay)1[ac-hj-np-z02-9]+))/gi;
 const hashTagRegex = /#(?<hashtag>[\p{Letter}\p{Number}_]+)/gu;
 const customEmojiRegex = /:(?<emoji>\w+):/gu;
 
@@ -135,7 +127,7 @@ const parseTextNote = (textNoteContent: string) => {
         const bech32Entity: Bech32Entity = {
           type: 'Bech32Entity',
           content: match[0],
-          data: decoded as Bech32Entity['data'],
+          data: decoded,
           isNIP19: match.groups.nip19 === 'nostr:',
         };
         result.push(bech32Entity);
@@ -172,39 +164,4 @@ const parseTextNote = (textNoteContent: string) => {
   return result;
 };
 
-export const resolveTagReference = (
-  { tagIndex, content }: TagReference,
-  event: NostrEvent,
-): MentionedUser | MentionedEvent | null => {
-  const tag = event.tags[tagIndex];
-  if (tag == null) return null;
-
-  const tagName = tag[0];
-
-  if (tagName === 'p' && isValidId(tag[1])) {
-    return {
-      type: 'MentionedUser',
-      tagIndex,
-      content,
-      pubkey: tag[1],
-    } satisfies MentionedUser;
-  }
-
-  if (tagName === 'e' && isValidId(tag[1])) {
-    const mention = eventWrapper(event)
-      .markedEventTags()
-      .find((ev) => ev.index === tagIndex);
-
-    return {
-      type: 'MentionedEvent',
-      tagIndex,
-      content,
-      eventId: tag[1],
-      marker: mention?.marker,
-    } satisfies MentionedEvent;
-  }
-
-  return null;
-};
-
 export default parseTextNote;
diff --git a/src/nostr/useBatchedEvents.ts b/src/nostr/useBatchedEvents.ts
index 9adf92e..45cbc88 100644
--- a/src/nostr/useBatchedEvents.ts
+++ b/src/nostr/useBatchedEvents.ts
@@ -1,117 +1,39 @@
-import { createSignal, createMemo, observable, type Accessor, type Signal } from 'solid-js';
+import { createSignal, type Accessor, type Signal } from 'solid-js';
 
-import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
 import { type Event as NostrEvent, type Filter, Kind } from 'nostr-tools';
 
 import useConfig from '@/core/useConfig';
-import eventWrapper from '@/nostr/event';
+import { genericEvent } from '@/nostr/event';
 import useBatch, { type Task } from '@/nostr/useBatch';
 import usePool from '@/nostr/usePool';
 import useStats from '@/nostr/useStats';
-import timeout from '@/utils/timeout';
+
+type ProfileTask = { type: 'Profile'; pubkey: string };
+type EventTask = { type: 'Event'; eventId: string };
+type ReactionsTask = { type: 'Reactions'; mentionedEventId: string };
+type ZapReceiptsTask = { type: 'ZapReceipts'; mentionedEventId: string };
+type RepostsTask = { type: 'Reposts'; mentionedEventId: string };
+type FollowingsTask = { type: 'Followings'; pubkey: string };
+type ParameterizedReplaceableEventTask = {
+  type: 'ParameterizedReplaceableEvent';
+  kind: number;
+  author: string;
+  identifier: string;
+};
 
 type TaskArg =
-  | { type: 'Profile'; pubkey: string }
-  | { type: 'Event'; eventId: string }
-  | { type: 'Reactions'; mentionedEventId: string }
-  | { type: 'ZapReceipts'; mentionedEventId: string }
-  | { type: 'Reposts'; mentionedEventId: string }
-  | { type: 'Followings'; pubkey: string };
+  | ProfileTask
+  | EventTask
+  | ReactionsTask
+  | ZapReceiptsTask
+  | RepostsTask
+  | FollowingsTask
+  | ParameterizedReplaceableEventTask;
 
 type BatchedEvents = { completed: boolean; events: NostrEvent[] };
 
 type TaskRes = Accessor<BatchedEvents>;
 
-// Profile
-// TODO zodにする
-// deleted等の特殊なもの
-export type StandardProfile = {
-  name?: string;
-  about?: string;
-  // user's icon
-  picture?: string;
-  // user's banner image
-  banner?: string;
-  nip05?: string; // NIP-05
-  lud06?: string; // NIP-57
-  lud16?: string; // NIP-57
-};
-
-export type NonStandardProfile = {
-  display_name?: string;
-  website?: string;
-};
-
-export type Profile = StandardProfile & NonStandardProfile;
-
-export type ProfileWithOtherProperties = Profile & Record<string, any>;
-
-export type UseProfileProps = {
-  pubkey: string;
-};
-
-type UseProfile = {
-  profile: () => ProfileWithOtherProperties | null;
-  invalidateProfile: () => Promise<void>;
-  query: CreateQueryResult<NostrEvent | null>;
-};
-
-// Event
-export type UseEventProps = {
-  eventId: string;
-};
-
-export type UseEvent = {
-  event: () => NostrEvent | null;
-  query: CreateQueryResult<NostrEvent | null>;
-};
-
-// Reactions
-export type UseReactionsProps = {
-  eventId: string;
-};
-
-export type UseReactions = {
-  reactions: () => NostrEvent[];
-  reactionsGroupedByContent: () => Map<string, NostrEvent[]>;
-  isReactedBy: (pubkey: string) => boolean;
-  isReactedByWithEmoji: (pubkey: string) => boolean;
-  invalidateReactions: () => Promise<void>;
-  query: CreateQueryResult<NostrEvent[]>;
-};
-
-// Reposts
-export type UseRepostsProps = {
-  eventId: string;
-};
-
-export type UseReposts = {
-  reposts: () => NostrEvent[];
-  isRepostedBy: (pubkey: string) => boolean;
-  invalidateReposts: () => Promise<void>;
-  query: CreateQueryResult<NostrEvent[]>;
-};
-
-// Followings
-type UseFollowingsProps = {
-  pubkey: string;
-};
-
-type Following = {
-  pubkey: string;
-  mainRelayUrl?: string;
-  petname?: string;
-};
-
-export type UseFollowings = {
-  followings: () => Following[];
-  followingPubkeys: () => string[];
-  invalidateFollowings: () => Promise<void>;
-  query: CreateQueryResult<NostrEvent | null>;
-};
-
-const EmojiRegex = /\p{Emoji_Presentation}/u;
-
 let count = 0;
 
 const { setActiveBatchSubscriptions } = useStats();
@@ -123,7 +45,16 @@ setInterval(() => {
 const EmptyBatchedEvents = { events: [], completed: true };
 const emptyBatchedEvents = () => EmptyBatchedEvents;
 
-const { exec } = useBatch<TaskArg, TaskRes>(() => ({
+const isParameterizedReplaceableEvent = (event: NostrEvent) =>
+  event.kind >= 30000 && event.kind < 40000;
+
+const keyForParameterizedReplaceableEvent = ({
+  kind,
+  author,
+  identifier,
+}: ParameterizedReplaceableEventTask) => `${kind}:${author}:${identifier}`;
+
+export const { exec } = useBatch<TaskArg, TaskRes>(() => ({
   interval: 2000,
   batchSize: 150,
   executor: (tasks) => {
@@ -132,6 +63,7 @@ const { exec } = useBatch<TaskArg, TaskRes>(() => ({
     const reactionsTasks = new Map<string, Task<TaskArg, TaskRes>[]>();
     const repostsTasks = new Map<string, Task<TaskArg, TaskRes>[]>();
     const zapReceiptsTasks = new Map<string, Task<TaskArg, TaskRes>[]>();
+    const parameterizedReplaceableEventsTasks = new Map<string, Task<TaskArg, TaskRes>[]>();
     const followingsTasks = new Map<string, Task<TaskArg, TaskRes>[]>();
 
     tasks.forEach((task) => {
@@ -150,6 +82,10 @@ const { exec } = useBatch<TaskArg, TaskRes>(() => ({
       } else if (task.args.type === 'ZapReceipts') {
         const current = zapReceiptsTasks.get(task.args.mentionedEventId) ?? [];
         repostsTasks.set(task.args.mentionedEventId, [...current, task]);
+      } else if (task.args.type === 'ParameterizedReplaceableEvent') {
+        const key = keyForParameterizedReplaceableEvent(task.args);
+        const current = parameterizedReplaceableEventsTasks.get(key) ?? [];
+        parameterizedReplaceableEventsTasks.set(key, [...current, task]);
       } else if (task.args.type === 'Followings') {
         const current = followingsTasks.get(task.args.pubkey) ?? [];
         followingsTasks.set(task.args.pubkey, [...current, task]);
@@ -183,6 +119,15 @@ const { exec } = useBatch<TaskArg, TaskRes>(() => ({
     if (followingsIds.length > 0) {
       filters.push({ kinds: [Kind.Contacts], authors: followingsIds });
     }
+    if (parameterizedReplaceableEventsTasks.size > 0) {
+      Array.from(parameterizedReplaceableEventsTasks.values()).forEach(([firstTask]) => {
+        if (firstTask.args.type !== 'ParameterizedReplaceableEvent') return;
+        const {
+          args: { kind, author, identifier },
+        } = firstTask;
+        filters.push({ kinds: [Kind.Contacts], authors: [author], '#d': [identifier] });
+      });
+    }
 
     if (filters.length === 0) return;
 
@@ -229,20 +174,20 @@ const { exec } = useBatch<TaskArg, TaskRes>(() => ({
 
       if (event.kind === Kind.Reaction) {
         // Use the last event id
-        const id = eventWrapper(event).lastTaggedEventId();
+        const id = genericEvent(event).lastTaggedEventId();
         if (id != null) {
           const registeredTasks = reactionsTasks.get(id) ?? [];
           resolveTasks(registeredTasks, event);
         }
       } else if ((event.kind as number) === 6) {
         // Use the last event id
-        const id = eventWrapper(event).lastTaggedEventId();
+        const id = genericEvent(event).lastTaggedEventId();
         if (id != null) {
           const registeredTasks = repostsTasks.get(id) ?? [];
           resolveTasks(registeredTasks, event);
         }
       } else if (event.kind === Kind.Zap) {
-        const eTags = eventWrapper(event).eTags();
+        const eTags = genericEvent(event).eTags();
         eTags.forEach(([, id]) => {
           const registeredTasks = repostsTasks.get(id) ?? [];
           resolveTasks(registeredTasks, event);
@@ -250,6 +195,15 @@ const { exec } = useBatch<TaskArg, TaskRes>(() => ({
       } else if (event.kind === Kind.Contacts) {
         const registeredTasks = followingsTasks.get(event.pubkey) ?? [];
         resolveTasks(registeredTasks, event);
+      } else if (isParameterizedReplaceableEvent(event)) {
+        const identifier = genericEvent(event).findFirstTagByName('d')?.[1];
+        if (identifier != null) {
+          const key = `${event.kind}:${event.pubkey}:${identifier}`;
+          const registeredTasks = parameterizedReplaceableEventsTasks.get(key) ?? [];
+          resolveTasks(registeredTasks, event);
+        } else {
+          console.warn('identifier is undefined');
+        }
       } else {
         const registeredTasks = eventTasks.get(event.id) ?? [];
         if (registeredTasks.length > 0) {
@@ -268,259 +222,7 @@ const { exec } = useBatch<TaskArg, TaskRes>(() => ({
   },
 }));
 
-const pickLatestEvent = (events: NostrEvent[]): NostrEvent | null => {
+export const pickLatestEvent = (events: NostrEvent[]): NostrEvent | null => {
   if (events.length === 0) return null;
   return events.reduce((a, b) => (a.created_at > b.created_at ? a : b));
 };
-
-export const useProfile = (propsProvider: () => UseProfileProps | null): UseProfile => {
-  const queryClient = useQueryClient();
-  const props = createMemo(propsProvider);
-  const genQueryKey = createMemo(() => ['useProfile', props()] as const);
-
-  const query = createQuery(
-    genQueryKey,
-    ({ queryKey, signal }) => {
-      const [, currentProps] = queryKey;
-      if (currentProps == null) return Promise.resolve(null);
-      const { pubkey } = currentProps;
-      if (pubkey.startsWith('npub1')) return Promise.resolve(null);
-      const promise = exec({ type: 'Profile', pubkey }, signal).then((batchedEvents) => {
-        const latestEvent = () => {
-          const latest = pickLatestEvent(batchedEvents().events);
-          if (latest == null) throw new Error(`profile not found: ${pubkey}`);
-          return latest;
-        };
-        observable(batchedEvents).subscribe(() => {
-          try {
-            queryClient.setQueryData(queryKey, latestEvent());
-          } catch (err) {
-            console.error('error occurred while updating profile cache: ', err);
-          }
-        });
-        return latestEvent();
-      });
-      // TODO timeoutと同時にsignalでキャンセルするようにしたい
-      return timeout(15000, `useProfile: ${pubkey}`)(promise);
-    },
-    {
-      // Profiles are updated occasionally, so a short staleTime is used here.
-      // cacheTime is long so that the user see profiles instantly.
-      staleTime: 5 * 60 * 1000, // 5 min
-      cacheTime: 24 * 60 * 60 * 1000, // 1 day
-      refetchInterval: 5 * 60 * 1000, // 5 min
-    },
-  );
-
-  const profile = createMemo((): Profile | null => {
-    if (query.data == null) return null;
-    const { content } = query.data;
-    if (content == null || content.length === 0) return null;
-    // TODO 大きすぎたりしないかどうか、JSONかどうかのチェック
-    try {
-      return JSON.parse(content) as Profile;
-    } catch (err) {
-      console.warn('failed to parse profile (kind 0): ', err, content);
-      return null;
-    }
-  });
-
-  const invalidateProfile = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
-
-  return { profile, invalidateProfile, query };
-};
-
-export const useEvent = (propsProvider: () => UseEventProps | null): UseEvent => {
-  const props = createMemo(propsProvider);
-
-  const query = createQuery(
-    () => ['useEvent', props()] as const,
-    ({ queryKey, signal }) => {
-      const [, currentProps] = queryKey;
-      if (currentProps == null) return null;
-      const { eventId } = currentProps;
-      const promise = exec({ type: 'Event', eventId }, signal).then((batchedEvents) => {
-        const event = batchedEvents().events[0];
-        if (event == null) throw new Error(`event not found: ${eventId}`);
-        return event;
-      });
-      return timeout(15000, `useEvent: ${eventId}`)(promise);
-    },
-    {
-      // Text notes never change, so they can be stored for a long time.
-      // However, events tend to be unreferenced as time passes.
-      staleTime: 4 * 60 * 60 * 1000, // 4 hour
-      cacheTime: 4 * 60 * 60 * 1000, // 4 hour
-      refetchOnWindowFocus: false,
-      refetchOnMount: false,
-    },
-  );
-
-  const event = () => query.data ?? null;
-
-  return { event, query };
-};
-
-export const useReactions = (propsProvider: () => UseReactionsProps | null): UseReactions => {
-  const queryClient = useQueryClient();
-  const props = createMemo(propsProvider);
-  const genQueryKey = createMemo(() => ['useReactions', props()] as const);
-
-  const query = createQuery(
-    genQueryKey,
-    ({ queryKey, signal }) => {
-      const [, currentProps] = queryKey;
-      if (currentProps == null) return [];
-
-      const { eventId: mentionedEventId } = currentProps;
-      const promise = exec({ type: 'Reactions', mentionedEventId }, signal).then(
-        (batchedEvents) => {
-          const events = () => batchedEvents().events;
-          observable(batchedEvents).subscribe(() => {
-            queryClient.setQueryData(queryKey, events());
-          });
-          return events();
-        },
-      );
-      return timeout(15000, `useReactions: ${mentionedEventId}`)(promise);
-    },
-    {
-      staleTime: 1 * 60 * 1000, // 1 min
-      cacheTime: 4 * 60 * 60 * 1000, // 4 hour
-      refetchInterval: 1 * 60 * 1000, // 1 min
-    },
-  );
-
-  const reactions = () => query.data ?? [];
-
-  const reactionsGroupedByContent = () => {
-    const result = new Map<string, NostrEvent[]>();
-    reactions().forEach((event) => {
-      const events = result.get(event.content) ?? [];
-      events.push(event);
-      result.set(event.content, events);
-    });
-    return result;
-  };
-
-  const isReactedBy = (pubkey: string): boolean =>
-    reactions().findIndex((event) => event.pubkey === pubkey) !== -1;
-
-  const isReactedByWithEmoji = (pubkey: string): boolean =>
-    reactions().findIndex((event) => event.pubkey === pubkey && EmojiRegex.test(event.content)) !==
-    -1;
-
-  const invalidateReactions = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
-
-  return {
-    reactions,
-    reactionsGroupedByContent,
-    isReactedBy,
-    isReactedByWithEmoji,
-    invalidateReactions,
-    query,
-  };
-};
-
-export const useReposts = (propsProvider: () => UseRepostsProps): UseReposts => {
-  const queryClient = useQueryClient();
-  const props = createMemo(propsProvider);
-  const genQueryKey = createMemo(() => ['useReposts', props()] as const);
-
-  const query = createQuery(
-    genQueryKey,
-    ({ queryKey, signal }) => {
-      const [, currentProps] = queryKey;
-      if (currentProps == null) return [];
-      const { eventId: mentionedEventId } = currentProps;
-      const promise = exec({ type: 'Reposts', mentionedEventId }, signal).then((batchedEvents) => {
-        const events = () => batchedEvents().events;
-        observable(batchedEvents).subscribe(() => {
-          queryClient.setQueryData(queryKey, events());
-        });
-        return events();
-      });
-      return timeout(15000, `useReposts: ${mentionedEventId}`)(promise);
-    },
-    {
-      staleTime: 1 * 60 * 1000, // 1 min
-      cacheTime: 4 * 60 * 60 * 1000, // 4 hour
-      refetchInterval: 1 * 60 * 1000, // 1 min
-    },
-  );
-
-  const reposts = () => query.data ?? [];
-
-  const isRepostedBy = (pubkey: string): boolean =>
-    reposts().findIndex((event) => event.pubkey === pubkey) !== -1;
-
-  const invalidateReposts = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
-
-  return { reposts, isRepostedBy, invalidateReposts, query };
-};
-
-export const useFollowings = (propsProvider: () => UseFollowingsProps | null): UseFollowings => {
-  const queryClient = useQueryClient();
-  const props = createMemo(propsProvider);
-  const genQueryKey = () => ['useFollowings', props()] as const;
-
-  const query = createQuery(
-    genQueryKey,
-    ({ queryKey, signal }) => {
-      console.debug('useFollowings');
-      const [, currentProps] = queryKey;
-      if (currentProps == null) return Promise.resolve(null);
-      const { pubkey } = currentProps;
-      const promise = exec({ type: 'Followings', pubkey }, signal).then((batchedEvents) => {
-        const latestEvent = () => {
-          const latest = pickLatestEvent(batchedEvents().events);
-          if (latest == null) throw new Error(`followings not found: ${pubkey}`);
-          return latest;
-        };
-        observable(batchedEvents).subscribe(() => {
-          try {
-            queryClient.setQueryData(queryKey, latestEvent());
-          } catch (err) {
-            console.error('error occurred while updating followings cache: ', err);
-          }
-        });
-        return latestEvent();
-      });
-      return timeout(15000, `useFollowings: ${pubkey}`)(promise);
-    },
-    {
-      staleTime: 5 * 60 * 1000, // 5 min
-      cacheTime: 24 * 60 * 60 * 1000, // 24 hour
-      refetchOnWindowFocus: false,
-      refetchOnReconnect: false,
-      refetchInterval: 0,
-    },
-  );
-
-  const followings = () => {
-    if (query.data == null) return [];
-
-    const result: Following[] = [];
-
-    // TODO zodにする
-    const event = eventWrapper(query.data);
-    event.pTags().forEach((tag) => {
-      const [, followingPubkey, mainRelayUrl, petname] = tag;
-
-      const following: Following = { pubkey: followingPubkey, petname };
-      if (mainRelayUrl != null && mainRelayUrl.length > 0) {
-        following.mainRelayUrl = mainRelayUrl;
-      }
-
-      result.push(following);
-    });
-
-    return result;
-  };
-
-  const followingPubkeys = (): string[] => followings().map((follow) => follow.pubkey);
-
-  const invalidateFollowings = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
-
-  return { followings, followingPubkeys, invalidateFollowings, query };
-};
diff --git a/src/nostr/useCommands.ts b/src/nostr/useCommands.ts
index 8056218..b7efe66 100644
--- a/src/nostr/useCommands.ts
+++ b/src/nostr/useCommands.ts
@@ -1,7 +1,7 @@
 import { getEventHash, Kind, type UnsignedEvent, type Pub } from 'nostr-tools';
 
 // import '@/types/nostr.d';
-import { Profile } from '@/nostr/useBatchedEvents';
+import { ProfileWithOtherProperties, Profile } from '@/nostr/event/Profile';
 import usePool from '@/nostr/usePool';
 import epoch from '@/utils/epoch';
 
@@ -186,7 +186,7 @@ const useCommands = () => {
     profile: Profile;
     otherProperties: Record<string, any>;
   }): Promise<Promise<void>[]> => {
-    const content = {
+    const content: ProfileWithOtherProperties = {
       ...profile,
       ...otherProperties,
     };
diff --git a/src/nostr/useEvent.ts b/src/nostr/useEvent.ts
index 8899afd..6be5088 100644
--- a/src/nostr/useEvent.ts
+++ b/src/nostr/useEvent.ts
@@ -1,3 +1,49 @@
-import { useEvent } from '@/nostr/useBatchedEvents';
+import { createMemo } from 'solid-js';
+
+import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
+import { Event as NostrEvent } from 'nostr-tools';
+
+import { exec } from '@/nostr/useBatchedEvents';
+import timeout from '@/utils/timeout';
+
+export type UseEventProps = {
+  eventId: string;
+};
+
+export type UseEvent = {
+  event: () => NostrEvent | null;
+  query: CreateQueryResult<NostrEvent | null>;
+};
+
+const useEvent = (propsProvider: () => UseEventProps | null): UseEvent => {
+  const props = createMemo(propsProvider);
+
+  const query = createQuery(
+    () => ['useEvent', props()] as const,
+    ({ queryKey, signal }) => {
+      const [, currentProps] = queryKey;
+      if (currentProps == null) return null;
+      const { eventId } = currentProps;
+      const promise = exec({ type: 'Event', eventId }, signal).then((batchedEvents) => {
+        const event = batchedEvents().events[0];
+        if (event == null) throw new Error(`event not found: ${eventId}`);
+        return event;
+      });
+      return timeout(15000, `useEvent: ${eventId}`)(promise);
+    },
+    {
+      // Text notes never change, so they can be stored for a long time.
+      // However, events tend to be unreferenced as time passes.
+      staleTime: 4 * 60 * 60 * 1000, // 4 hour
+      cacheTime: 4 * 60 * 60 * 1000, // 4 hour
+      refetchOnWindowFocus: false,
+      refetchOnMount: false,
+    },
+  );
+
+  const event = () => query.data ?? null;
+
+  return { event, query };
+};
 
 export default useEvent;
diff --git a/src/nostr/useFollowings.ts b/src/nostr/useFollowings.ts
index 4495073..6f37359 100644
--- a/src/nostr/useFollowings.ts
+++ b/src/nostr/useFollowings.ts
@@ -1,3 +1,94 @@
-import { useFollowings } from '@/nostr/useBatchedEvents';
+import { createMemo, observable } from 'solid-js';
+
+import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
+import { Event as NostrEvent } from 'nostr-tools';
+
+import { genericEvent } from '@/nostr/event';
+import { exec, pickLatestEvent } from '@/nostr/useBatchedEvents';
+import timeout from '@/utils/timeout';
+
+type Following = {
+  pubkey: string;
+  mainRelayUrl?: string;
+  petname?: string;
+};
+
+type UseFollowingsProps = {
+  pubkey: string;
+};
+
+export type UseFollowings = {
+  followings: () => Following[];
+  followingPubkeys: () => string[];
+  invalidateFollowings: () => Promise<void>;
+  query: CreateQueryResult<NostrEvent | null>;
+};
+
+export const useFollowings = (propsProvider: () => UseFollowingsProps | null): UseFollowings => {
+  const queryClient = useQueryClient();
+  const props = createMemo(propsProvider);
+  const genQueryKey = () => ['useFollowings', props()] as const;
+
+  const query = createQuery(
+    genQueryKey,
+    ({ queryKey, signal }) => {
+      console.debug('useFollowings');
+      const [, currentProps] = queryKey;
+      if (currentProps == null) return Promise.resolve(null);
+      const { pubkey } = currentProps;
+      const promise = exec({ type: 'Followings', pubkey }, signal).then((batchedEvents) => {
+        const latestEvent = () => {
+          const latest = pickLatestEvent(batchedEvents().events);
+          if (latest == null) throw new Error(`followings not found: ${pubkey}`);
+          return latest;
+        };
+        observable(batchedEvents).subscribe(() => {
+          try {
+            queryClient.setQueryData(queryKey, latestEvent());
+          } catch (err) {
+            console.error('error occurred while updating followings cache: ', err);
+          }
+        });
+        return latestEvent();
+      });
+      return timeout(15000, `useFollowings: ${pubkey}`)(promise);
+    },
+    {
+      staleTime: 5 * 60 * 1000, // 5 min
+      cacheTime: 24 * 60 * 60 * 1000, // 24 hour
+      refetchOnMount: false,
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+      refetchInterval: 0,
+    },
+  );
+
+  const followings = () => {
+    if (query.data == null) return [];
+
+    const result: Following[] = [];
+
+    // TODO zodにする
+    const event = genericEvent(query.data);
+    event.pTags().forEach((tag) => {
+      const [, followingPubkey, mainRelayUrl, petname] = tag;
+
+      const following: Following = { pubkey: followingPubkey, petname };
+      if (mainRelayUrl != null && mainRelayUrl.length > 0) {
+        following.mainRelayUrl = mainRelayUrl;
+      }
+
+      result.push(following);
+    });
+
+    return result;
+  };
+
+  const followingPubkeys = (): string[] => followings().map((follow) => follow.pubkey);
+
+  const invalidateFollowings = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
+
+  return { followings, followingPubkeys, invalidateFollowings, query };
+};
 
 export default useFollowings;
diff --git a/src/nostr/useParameterizedReplaceableEvent.ts b/src/nostr/useParameterizedReplaceableEvent.ts
new file mode 100644
index 0000000..85a3bad
--- /dev/null
+++ b/src/nostr/useParameterizedReplaceableEvent.ts
@@ -0,0 +1,78 @@
+import { createMemo, observable } from 'solid-js';
+
+import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
+import { Event as NostrEvent } from 'nostr-tools';
+
+import { exec, pickLatestEvent } from '@/nostr/useBatchedEvents';
+import timeout from '@/utils/timeout';
+
+// Parameterized Replaceable Event
+export type UseParameterizedReplaceableEventProps = {
+  kind: number;
+  author: string;
+  identifier: string;
+};
+
+export type UseParameterizedReplaceableEvent = {
+  event: () => NostrEvent | null;
+  query: CreateQueryResult<NostrEvent | null>;
+};
+
+export const useParameterizedReplaceableEvent = (
+  propsProvider: () => UseParameterizedReplaceableEventProps | null,
+): UseParameterizedReplaceableEvent => {
+  const queryClient = useQueryClient();
+  const props = createMemo(propsProvider);
+  const genQueryKey = () => ['useFollowings', props()] as const;
+
+  const query = createQuery(
+    genQueryKey,
+    ({ queryKey, signal }) => {
+      console.debug('useFollowings');
+      const [, currentProps] = queryKey;
+      if (currentProps == null) return Promise.resolve(null);
+
+      const { kind, author, identifier } = currentProps;
+      const promise = exec(
+        { type: 'ParameterizedReplaceableEvent', kind, author, identifier },
+        signal,
+      ).then((batchedEvents) => {
+        const latestEvent = () => {
+          const latest = pickLatestEvent(batchedEvents().events);
+          if (latest == null)
+            throw new Error(
+              `parameterized replaceable event not found: ${kind}:${author}:${identifier}`,
+            );
+          return latest;
+        };
+
+        observable(batchedEvents).subscribe(() => {
+          try {
+            queryClient.setQueryData(queryKey, latestEvent());
+          } catch (err) {
+            console.error(
+              'error occurred while updating parameterized replaceable event cache: ',
+              err,
+            );
+          }
+        });
+        return latestEvent();
+      });
+
+      return timeout(
+        15000,
+        `useParameterizedReplaceableEvent: ${kind}:${author}:${identifier}`,
+      )(promise);
+    },
+    {
+      staleTime: 5 * 60 * 1000, // 5 min
+      cacheTime: 4 * 60 * 60 * 1000, // 4 hour
+    },
+  );
+
+  const event = () => query.data ?? null;
+
+  return { event, query };
+};
+
+export default useParameterizedReplaceableEvent;
diff --git a/src/nostr/useProfile.ts b/src/nostr/useProfile.ts
index aec6359..b515f33 100644
--- a/src/nostr/useProfile.ts
+++ b/src/nostr/useProfile.ts
@@ -1,3 +1,99 @@
-import { useProfile } from '@/nostr/useBatchedEvents';
+import { createMemo, observable } from 'solid-js';
+
+import {
+  createQuery,
+  useQueryClient,
+  type CreateQueryResult,
+  QueryClient,
+} from '@tanstack/solid-query';
+import { Event as NostrEvent } from 'nostr-tools';
+
+import { Profile, ProfileWithOtherProperties, safeParseProfile } from '@/nostr/event/Profile';
+import { exec, pickLatestEvent } from '@/nostr/useBatchedEvents';
+import timeout from '@/utils/timeout';
+
+export type UseProfileProps = {
+  pubkey: string;
+};
+
+export type UseProfile = {
+  profile: () => ProfileWithOtherProperties | null;
+  invalidateProfile: () => Promise<void>;
+  query: CreateQueryResult<NostrEvent | null>;
+};
+
+export type UseProfilesProps = {
+  pubkeys: string[];
+};
+
+export type UseProfiles = {
+  profiles: () => Record<string, ProfileWithOtherProperties>;
+  queries: CreateQueryResult<NostrEvent | null>[];
+};
+
+type UseProfileQueryKey = readonly ['useProfile', UseProfileProps | null];
+
+const queryOptions = {
+  // Profiles are updated occasionally, so a short staleTime is used here.
+  // cacheTime is long so that the user see profiles instantly.
+  staleTime: 5 * 60 * 1000, // 5 min
+  cacheTime: 24 * 60 * 60 * 1000, // 1 day
+  refetchInterval: 5 * 60 * 1000, // 5 min
+};
+
+const getProfile = ({
+  queryKey,
+  signal,
+  queryClient,
+}: {
+  queryKey: UseProfileQueryKey;
+  signal?: AbortSignal;
+  queryClient: QueryClient;
+}): Promise<NostrEvent | null> => {
+  const [, currentProps] = queryKey;
+  if (currentProps == null) return Promise.resolve(null);
+
+  const { pubkey } = currentProps;
+
+  const promise = exec({ type: 'Profile', pubkey }, signal).then((batchedEvents) => {
+    const latestEvent = () => {
+      const latest = pickLatestEvent(batchedEvents().events);
+      if (latest == null) throw new Error(`profile not found: ${pubkey}`);
+      return latest;
+    };
+    observable(batchedEvents).subscribe(() => {
+      try {
+        queryClient.setQueryData(queryKey, latestEvent());
+      } catch (err) {
+        console.error('error occurred while updating profile cache: ', err);
+      }
+    });
+    return latestEvent();
+  });
+  // TODO timeoutと同時にsignalでキャンセルするようにしたい
+  return timeout(15000, `useProfile: ${pubkey}`)(promise);
+};
+
+export const useProfile = (propsProvider: () => UseProfileProps | null): UseProfile => {
+  const queryClient = useQueryClient();
+  const props = createMemo(propsProvider);
+  const genQueryKey = createMemo((): UseProfileQueryKey => ['useProfile', props()] as const);
+
+  const query = createQuery(
+    genQueryKey,
+    ({ queryKey, signal }) => getProfile({ queryKey, signal, queryClient }),
+    queryOptions,
+  );
+
+  const profile = createMemo((): Profile | null => {
+    if (query.data == null) return null;
+    const { content } = query.data;
+    return safeParseProfile(content);
+  });
+
+  const invalidateProfile = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
+
+  return { profile, invalidateProfile, query };
+};
 
 export default useProfile;
diff --git a/src/nostr/useReactions.ts b/src/nostr/useReactions.ts
index d6b43ee..0a2a60c 100644
--- a/src/nostr/useReactions.ts
+++ b/src/nostr/useReactions.ts
@@ -1,3 +1,85 @@
-import { useReactions } from '@/nostr/useBatchedEvents';
+import { createMemo, observable } from 'solid-js';
+
+import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
+import { Event as NostrEvent } from 'nostr-tools';
+
+import { exec } from '@/nostr/useBatchedEvents';
+import timeout from '@/utils/timeout';
+
+export type UseReactionsProps = {
+  eventId: string;
+};
+
+export type UseReactions = {
+  reactions: () => NostrEvent[];
+  reactionsGroupedByContent: () => Map<string, NostrEvent[]>;
+  isReactedBy: (pubkey: string) => boolean;
+  isReactedByWithEmoji: (pubkey: string) => boolean;
+  invalidateReactions: () => Promise<void>;
+  query: CreateQueryResult<NostrEvent[]>;
+};
+
+const EmojiRegex = /\p{Emoji_Presentation}/u;
+
+const useReactions = (propsProvider: () => UseReactionsProps | null): UseReactions => {
+  const queryClient = useQueryClient();
+  const props = createMemo(propsProvider);
+  const genQueryKey = createMemo(() => ['useReactions', props()] as const);
+
+  const query = createQuery(
+    genQueryKey,
+    ({ queryKey, signal }) => {
+      const [, currentProps] = queryKey;
+      if (currentProps == null) return [];
+
+      const { eventId: mentionedEventId } = currentProps;
+      const promise = exec({ type: 'Reactions', mentionedEventId }, signal).then(
+        (batchedEvents) => {
+          const events = () => batchedEvents().events;
+          observable(batchedEvents).subscribe(() => {
+            queryClient.setQueryData(queryKey, events());
+          });
+          return events();
+        },
+      );
+      return timeout(15000, `useReactions: ${mentionedEventId}`)(promise);
+    },
+    {
+      staleTime: 1 * 60 * 1000, // 1 min
+      cacheTime: 4 * 60 * 60 * 1000, // 4 hour
+      refetchInterval: 1 * 60 * 1000, // 1 min
+    },
+  );
+
+  const reactions = () => query.data ?? [];
+
+  const reactionsGroupedByContent = () => {
+    const result = new Map<string, NostrEvent[]>();
+    reactions().forEach((event) => {
+      const events = result.get(event.content) ?? [];
+      events.push(event);
+      result.set(event.content, events);
+    });
+    return result;
+  };
+
+  const isReactedBy = (pubkey: string): boolean =>
+    reactions().findIndex((event) => event.pubkey === pubkey) !== -1;
+
+  const isReactedByWithEmoji = (pubkey: string): boolean =>
+    reactions().findIndex((event) => event.pubkey === pubkey && EmojiRegex.test(event.content)) !==
+    -1;
+
+  const invalidateReactions = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
+
+  return {
+    reactions,
+    reactionsGroupedByContent,
+    isReactedBy,
+    isReactedByWithEmoji,
+    invalidateReactions,
+    query,
+  };
+};
 
 export default useReactions;
diff --git a/src/nostr/useReposts.ts b/src/nostr/useReposts.ts
index 56985fd..78aaed7 100644
--- a/src/nostr/useReposts.ts
+++ b/src/nostr/useReposts.ts
@@ -1,3 +1,57 @@
-import { useReposts } from '@/nostr/useBatchedEvents';
+import { createMemo, observable } from 'solid-js';
+
+import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
+import { Event as NostrEvent } from 'nostr-tools';
+
+import { exec } from '@/nostr/useBatchedEvents';
+import timeout from '@/utils/timeout';
+
+export type UseRepostsProps = {
+  eventId: string;
+};
+
+export type UseReposts = {
+  reposts: () => NostrEvent[];
+  isRepostedBy: (pubkey: string) => boolean;
+  invalidateReposts: () => Promise<void>;
+  query: CreateQueryResult<NostrEvent[]>;
+};
+
+export const useReposts = (propsProvider: () => UseRepostsProps): UseReposts => {
+  const queryClient = useQueryClient();
+  const props = createMemo(propsProvider);
+  const genQueryKey = createMemo(() => ['useReposts', props()] as const);
+
+  const query = createQuery(
+    genQueryKey,
+    ({ queryKey, signal }) => {
+      const [, currentProps] = queryKey;
+      if (currentProps == null) return [];
+      const { eventId: mentionedEventId } = currentProps;
+      const promise = exec({ type: 'Reposts', mentionedEventId }, signal).then((batchedEvents) => {
+        const events = () => batchedEvents().events;
+        observable(batchedEvents).subscribe(() => {
+          queryClient.setQueryData(queryKey, events());
+        });
+        return events();
+      });
+      return timeout(15000, `useReposts: ${mentionedEventId}`)(promise);
+    },
+    {
+      staleTime: 1 * 60 * 1000, // 1 min
+      cacheTime: 4 * 60 * 60 * 1000, // 4 hour
+      refetchInterval: 1 * 60 * 1000, // 1 min
+    },
+  );
+
+  const reposts = () => query.data ?? [];
+
+  const isRepostedBy = (pubkey: string): boolean =>
+    reposts().findIndex((event) => event.pubkey === pubkey) !== -1;
+
+  const invalidateReposts = (): Promise<void> => queryClient.invalidateQueries(genQueryKey());
+
+  return { reposts, isRepostedBy, invalidateReposts, query };
+};
 
 export default useReposts;
diff --git a/src/nostr/useStats.ts b/src/nostr/useStats.ts
index 190c3d1..c6ccfb5 100644
--- a/src/nostr/useStats.ts
+++ b/src/nostr/useStats.ts
@@ -10,6 +10,10 @@ const [stats, setStats] = createStore<Stats>({
   activeBatchSubscriptions: 0,
 });
 
+setInterval(() => {
+  console.debug('stats', { ...stats });
+}, 1000);
+
 const useStats = () => {
   const setActiveSubscriptions = (count: number) => setStats('activeSubscriptions', count);
 
diff --git a/src/nostr/useSubscription.ts b/src/nostr/useSubscription.ts
index 1dbcc70..13a4cd0 100644
--- a/src/nostr/useSubscription.ts
+++ b/src/nostr/useSubscription.ts
@@ -1,11 +1,10 @@
-import { createSignal, createMemo, createEffect, onMount, onCleanup, on } from 'solid-js';
+import { createSignal, createEffect, onMount, onCleanup, on } from 'solid-js';
 
 import uniqBy from 'lodash/uniqBy';
 
 import useConfig from '@/core/useConfig';
 import usePool from '@/nostr/usePool';
 import useStats from '@/nostr/useStats';
-import epoch from '@/utils/epoch';
 
 import type { Event as NostrEvent, Filter, SubscriptionOptions } from 'nostr-tools';
 
@@ -77,6 +76,8 @@ const useSubscription = (propsProvider: () => UseSubscriptionProps | null) => {
   };
 
   const startSubscription = () => {
+    console.debug('startSubscription: start');
+
     const props = propsProvider();
     if (props == null) return;
     const { relayUrls, filters, options, onEvent, onEOSE, continuous = true } = props;
@@ -140,6 +141,7 @@ const useSubscription = (propsProvider: () => UseSubscriptionProps | null) => {
     }, 100);
 
     onCleanup(() => {
+      console.debug('startSubscription: end');
       sub.unsub();
       if (subscribing) {
         subscribing = false;
diff --git a/src/utils/ensureSchema.ts b/src/utils/ensureSchema.ts
new file mode 100644
index 0000000..ba2d20a
--- /dev/null
+++ b/src/utils/ensureSchema.ts
@@ -0,0 +1,8 @@
+import { z } from 'zod';
+
+const ensureSchema =
+  <T>(schema: z.Schema<T>) =>
+  (value: any): value is T =>
+    schema.safeParse(value).success;
+
+export default ensureSchema;