(feat): use hydrated entity and export