diff --git a/src/rstd/collections/stack.rs b/src/rstd/collections/stack.rs
index fce68fc..4dcacc3 100644
--- a/src/rstd/collections/stack.rs
+++ b/src/rstd/collections/stack.rs
@@ -205,16 +205,16 @@ where
     }
 }
 
-impl<'a, Ctx: Context<'a>, F: Factory<'a, Ctx> + InliningFactory<'a, Ctx>> InliningFactory<'a, Ctx>
+impl<'a, Ctx: Context<'a>, F: Factory<'a, Ctx> + InliningFactory<'a, Ctx>> QInliningFactory<'a, Ctx>
     for StackNodeFactory<F>
 where
     F::Mtbl: MentionableTop<'a, Ctx>,
 {
-    fn extension_error(&self, tail: &[u8]) -> Self::ParseError {
+    fn qextension_error(&self, tail: &[u8]) -> Self::ParseError {
         StackParseError::Element(self.element_factory.extension_error(tail))
     }
 
-    fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
+    fn qideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
         let (rest, inctx) = self.parse_point(inctx)?;
         let (element, inctx) = self
             .element_factory
diff --git a/src/rstd/collections/tree.rs b/src/rstd/collections/tree.rs
index 4f928ce..aef5999 100644
--- a/src/rstd/collections/tree.rs
+++ b/src/rstd/collections/tree.rs
@@ -172,12 +172,12 @@ impl<F> ImplMode for TreeFactory<F> {
     type Mode = InliningMode;
 }
 
-impl<'a, Ctx: Context<'a>, F: FactoryParse<'a, Ctx>> InliningFactory<'a, Ctx> for TreeFactory<F> {
-    fn extension_error(&self, tail: &[u8]) -> Self::ParseError {
+impl<'a, Ctx: Context<'a>, F: FactoryParse<'a, Ctx>> QInliningFactory<'a, Ctx> for TreeFactory<F> {
+    fn qextension_error(&self, tail: &[u8]) -> Self::ParseError {
         u64::a_extension_error(tail).into()
     }
 
-    fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
+    fn qideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
         let (node, inctx) = self.0.ideserialize(inctx)?;
         let (height, inctx) = u64::a_ideserialize(inctx)?;
         let tree = Tree { node, height };
diff --git a/src/rstd/inlining.rs b/src/rstd/inlining.rs
index 1242144..958cba1 100644
--- a/src/rstd/inlining.rs
+++ b/src/rstd/inlining.rs
@@ -14,6 +14,14 @@ pub use self::modes::InliningMode;
 
 pub type IParseResult<'a, Ctx, F, I> = Result<(Mtbl<'a, Ctx, F>, I), ParseError<'a, Ctx, F>>;
 
+pub trait QInliningFactory<'a, Ctx: Context<'a>>:
+    FactoryBase<'a, Ctx> + ImplMode<Mode = InliningMode>
+{
+    fn qextension_error(&self, tail: &[u8]) -> Self::ParseError;
+
+    fn qideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I>;
+}
+
 /// This factory should return an error on EOF.
 pub trait InliningFactory<'a, Ctx: Context<'a>>:
     FactoryBase<'a, Ctx> + ParseMode<Mode = InliningMode>
@@ -23,6 +31,18 @@ pub trait InliningFactory<'a, Ctx: Context<'a>>:
     fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I>;
 }
 
+impl<'a, Ctx: Context<'a>, F: FactoryModeParse<'a, Ctx> + ParseMode<Mode = InliningMode>>
+    InliningFactory<'a, Ctx> for F
+{
+    fn extension_error(&self, tail: &[u8]) -> Self::ParseError {
+        self.mextend((), tail)
+    }
+
+    fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
+        self.mdeserialize(inctx)
+    }
+}
+
 /// This factory always reads the same amount of bytes or returns error.
 pub trait FixedSizeFactory<'a, Ctx: Context<'a>>: InliningFactory<'a, Ctx> {
     /// For [`ConstSizeFactory`] this must return [`ConstSizeFactory::SIZE`].
@@ -84,24 +104,17 @@ pub trait ConstSizeAtomic: InliningAtomic {
     const SIZE: usize;
 }
 
-impl<'a, Ctx: Context<'a>, A: InliningAtomic> InliningFactory<'a, Ctx> for AtomicFactory<A> {
-    fn extension_error(&self, tail: &[u8]) -> Self::ParseError {
-        A::a_extension_error(tail)
-    }
-
-    fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
-        let (a, inctx) = A::a_ideserialize(inctx)?;
-        Ok((a.into(), inctx))
-    }
-}
-
-impl<'a, Ctx: Context<'a>, A: ConstSizeAtomic> FixedSizeFactory<'a, Ctx> for AtomicFactory<A> {
+impl<'a, Ctx: Context<'a>, A: ConstSizeAtomic + AtomicModeParse> FixedSizeFactory<'a, Ctx>
+    for AtomicFactory<A>
+{
     fn size(&self) -> usize {
         A::SIZE
     }
 }
 
-impl<'a, Ctx: Context<'a>, A: ConstSizeAtomic> ConstSizeFactory<'a, Ctx> for AtomicFactory<A> {
+impl<'a, Ctx: Context<'a>, A: ConstSizeAtomic + AtomicModeParse> ConstSizeFactory<'a, Ctx>
+    for AtomicFactory<A>
+{
     const SIZE: usize = A::SIZE;
 }
 
diff --git a/src/rstd/inlining/modes.rs b/src/rstd/inlining/modes.rs
index 66c1bfe..31f93d9 100644
--- a/src/rstd/inlining/modes.rs
+++ b/src/rstd/inlining/modes.rs
@@ -55,7 +55,7 @@ impl Mode for InliningMode {
     }
 }
 
-impl<'a, Ctx: Context<'a>, F: InliningFactory<'a, Ctx>> FactoryModeProxy<'a, Ctx>
+impl<'a, Ctx: Context<'a>, F: QInliningFactory<'a, Ctx>> FactoryModeProxy<'a, Ctx>
     for WithMode<F, InliningMode>
 {
     type F = F;
diff --git a/src/rstd/inlining/static_pair.rs b/src/rstd/inlining/static_pair.rs
index 96ac0db..ae3e2cc 100644
--- a/src/rstd/inlining/static_pair.rs
+++ b/src/rstd/inlining/static_pair.rs
@@ -172,17 +172,17 @@ where
     }
 }
 
-impl<'a, Ctx: Context<'a>, SP: StaticPair<'a, Ctx>> InliningFactory<'a, Ctx>
+impl<'a, Ctx: Context<'a>, SP: StaticPair<'a, Ctx>> QInliningFactory<'a, Ctx>
     for StaticPairFactory<'a, Ctx, SP>
 where
     SP::FB: InliningFactory<'a, Ctx>,
 {
-    fn extension_error(&self, tail: &[u8]) -> Self::ParseError {
+    fn qextension_error(&self, tail: &[u8]) -> Self::ParseError {
         let (_, fb) = SP::factories(&self.factory_data);
         SP::from_error_b(&self.factory_data, fb.extension_error(tail))
     }
 
-    fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
+    fn qideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
         let (fa, fb) = SP::factories(&self.factory_data);
         let (a, inctx) = fa
             .ideserialize(inctx)
diff --git a/src/rstd/nullable.rs b/src/rstd/nullable.rs
index 0316943..e0b8499 100644
--- a/src/rstd/nullable.rs
+++ b/src/rstd/nullable.rs
@@ -107,14 +107,14 @@ impl<'a, Ctx: Context<'a>, A: MentionableBase<'a, Ctx>> Clone for Nullable<'a, C
     }
 }
 
-impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> InliningFactory<'a, Ctx>
+impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> QInliningFactory<'a, Ctx>
     for NullableFactory<F>
 {
-    fn extension_error(&self, tail: &[u8]) -> Self::ParseError {
+    fn qextension_error(&self, tail: &[u8]) -> Self::ParseError {
         PointParseError::WrongLength(HASH_SIZE + tail.len())
     }
 
-    fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
+    fn qideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
         let factory = self.factory.clone();
         let (address, inctx) = inctx.icnext_address(|slice| PointParseError::from(slice))?;
         Ok((
diff --git a/src/rstd/point.rs b/src/rstd/point.rs
index 10fefee..a37ab2d 100644
--- a/src/rstd/point.rs
+++ b/src/rstd/point.rs
@@ -79,16 +79,16 @@ impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> FactoryBase<'a, Ctx> for Poi
     type ParseError = PointParseError;
 }
 
-impl<F> ParseMode for PointFactory<F> {
+impl<F> ImplMode for PointFactory<F> {
     type Mode = InliningMode;
 }
 
-impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> InliningFactory<'a, Ctx> for PointFactory<F> {
-    fn extension_error(&self, tail: &[u8]) -> Self::ParseError {
+impl<'a, Ctx: Context<'a>, F: FactoryBase<'a, Ctx>> QInliningFactory<'a, Ctx> for PointFactory<F> {
+    fn qextension_error(&self, tail: &[u8]) -> Self::ParseError {
         PointParseError::WrongLength(HASH_SIZE + tail.len())
     }
 
-    fn ideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
+    fn qideserialize<I: InCtx<'a, Ctx>>(&self, inctx: I) -> IParseResult<'a, Ctx, Self, I> {
         inctx.icnext_point(self.inner(), |slice| PointParseError::from(slice))
     }
 }