diff --git a/client/encoding.go b/client/encoding.go
index f33878e..12d760a 100644
--- a/client/encoding.go
+++ b/client/encoding.go
@@ -30,15 +30,25 @@ func MakeCodec(moduleBasics []module.AppModuleBasic) Codec {
 	modBasic.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	modBasic.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
-	osmosisGammTypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	osmosisPoolManagerTypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	osmosisLockupTypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-	tendermintLiquidityTypes.RegisterLegacyAminoCodec(encodingConfig.Amino)
-	tendermintLiquidityTypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-
 	return encodingConfig
 }
 
+// Split out from base codec to not include explicitly.
+// Should be included only when needed.
+func RegisterOsmosisInterfaces(registry types.InterfaceRegistry) {
+	// Needs to be extended in order to cover all the modules
+	osmosisGammTypes.RegisterInterfaces(registry)
+	osmosisPoolManagerTypes.RegisterInterfaces(registry)
+	osmosisLockupTypes.RegisterInterfaces(registry)
+}
+
+// Split out from base codec to not include explicitly.
+// Should be included only when needed.
+func RegisterTendermintLiquidityInterfaces(aminoCodec *codec.LegacyAmino, registry types.InterfaceRegistry) {
+	tendermintLiquidityTypes.RegisterLegacyAminoCodec(aminoCodec)
+	tendermintLiquidityTypes.RegisterInterfaces(registry)
+}
+
 func MakeCodecConfig() Codec {
 	interfaceRegistry := types.NewInterfaceRegistry()
 	marshaler := codec.NewProtoCodec(interfaceRegistry)
diff --git a/main.go b/main.go
index 7c98d64..6053295 100644
--- a/main.go
+++ b/main.go
@@ -35,7 +35,7 @@ func main() {
 	}
 
 	// Proof of concept code
-	var checkHeight int64 = 9779691
+	var checkHeight int64 = 17593361
 
 	// Check chain status
 	query := querier.Query{Client: cl, Options: &querier.QueryOptions{}}