diff --git a/benchmarks/sizeof/init b/benchmarks/sizeof/init
index f43f5bd0e..6f668dabf 100644
--- a/benchmarks/sizeof/init
+++ b/benchmarks/sizeof/init
@@ -1,5 +1,5 @@
 #ifndef _sizeof_icpp_init_stub
 #define _sizeof_icpp_init_stub
 #include "Core/init"
-#include "CtrlLib/init"
+#include "Draw/init"
 #endif
diff --git a/benchmarks/sizeof/main.cpp b/benchmarks/sizeof/main.cpp
index f85f90e9f..be748097e 100644
--- a/benchmarks/sizeof/main.cpp
+++ b/benchmarks/sizeof/main.cpp
@@ -1,9 +1,10 @@
-#include <CtrlLib/CtrlLib.h>
+#include <Draw/Draw.h>
 
 using namespace Upp;
 
-GUI_APP_MAIN
+CONSOLE_APP_MAIN
 {
+	StdLogSetup(LOG_COUT|LOG_FILE);
 	RDUMP(sizeof(bool));
 	RDUMP(sizeof(int));
 	RDUMP(sizeof(unsigned));
@@ -20,6 +21,7 @@ GUI_APP_MAIN
 	RDUMP(sizeof(float));
 	RDUMP(sizeof(double));
 	RDUMP(sizeof(long double));
+	RLOG("========================");
 	RDUMP(sizeof(Date));
 	RDUMP(sizeof(Time));
 	RDUMP(sizeof(Size));
@@ -28,15 +30,15 @@ GUI_APP_MAIN
 	RDUMP(sizeof(Color));
 	RDUMP(sizeof(Complex));
 	RDUMP(sizeof(Uuid));
-	RDUMP(sizeof(ValueArray));
-	RDUMP(sizeof(ValueMap));
 	RDUMP(sizeof(Mutex));
 	RDUMP(sizeof(RWMutex));
-	RDUMP(sizeof(Image));
-	RDUMP(sizeof(Font));
-	RDUMP(sizeof(AttrText));
-	RDUMP(sizeof(Painting));
-	RDUMP(sizeof(Drawing));
+	RLOG("========================");
+	RDUMP(sizeof(String));
+	RDUMP(sizeof(WString));
+	RDUMP(sizeof(Value));
+	RDUMP(sizeof(ValueArray));
+	RDUMP(sizeof(ValueMap));
+	RLOG("========================");
 	RDUMP(sizeof(Vector<int>));
 	RDUMP(sizeof(Array<int>));
 	RDUMP(sizeof(Index<int>));
@@ -48,6 +50,12 @@ GUI_APP_MAIN
 	RDUMP(sizeof(InVector<int>));
 	RDUMP(sizeof(InArray<int>));
 	RDUMP(sizeof(SortedIndex<int>));
-	RDUMP(sizeof(String));
-	RDUMP(sizeof(WString));
+	RDUMP(sizeof(SortedVectorMap<int, int>));
+	RDUMP(sizeof(SortedArrayMap<int, int>));
+	RLOG("========================");
+	RDUMP(sizeof(Image));
+	RDUMP(sizeof(Font));
+	RDUMP(sizeof(AttrText));
+	RDUMP(sizeof(Painting));
+	RDUMP(sizeof(Drawing));
 }
diff --git a/benchmarks/sizeof/sizeof.upp b/benchmarks/sizeof/sizeof.upp
index 05e608db5..aa2e609ec 100644
--- a/benchmarks/sizeof/sizeof.upp
+++ b/benchmarks/sizeof/sizeof.upp
@@ -1,6 +1,6 @@
 uses
 	Core,
-	CtrlLib;
+	Draw;
 
 file
 	main.cpp
@@ -8,5 +8,5 @@ file
 	info.txt;
 
 mainconfig
-	"" = "GUI MT";
+	"" = "MT";