Index: kernel/generic/include/config.h
===================================================================
--- kernel/generic/include/config.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/config.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -36,11 +36,19 @@
 #define KERN_CONFIG_H_
 
-#include <typedefs.h>
 #include <arch/mm/page.h>
 
-#define STACK_SIZE  PAGE_SIZE
+#define ONE_FRAME    0
+#define TWO_FRAMES   1
+#define FOUR_FRAMES  2
+
+#define STACK_FRAMES  TWO_FRAMES
+#define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
 
 #define CONFIG_INIT_TASKS        32
 #define CONFIG_TASK_NAME_BUFLEN  32
+
+#ifndef __ASM__
+
+#include <typedefs.h>
 
 typedef struct {
@@ -80,4 +88,6 @@
 extern ballocs_t ballocs;
 
+#endif /* __ASM__ */
+
 #endif
 
Index: kernel/generic/include/cpu.h
===================================================================
--- kernel/generic/include/cpu.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/cpu.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -41,6 +41,4 @@
 #include <arch/cpu.h>
 #include <arch/context.h>
-
-#define CPU_STACK_SIZE  STACK_SIZE
 
 /** CPU structure.
Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/mm/as.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -84,5 +84,9 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#ifdef USTACK_ADDRESS_ARCH
+	#define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#else
+	#define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
+#endif
 
 /** Kernel address space. */
Index: kernel/generic/include/mm/frame.h
===================================================================
--- kernel/generic/include/mm/frame.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/mm/frame.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -44,15 +44,4 @@
 #include <arch/mm/page.h>
 #include <arch/mm/frame.h>
-
-#define ONE_FRAME    0
-#define TWO_FRAMES   1
-#define FOUR_FRAMES  2
-
-
-#ifdef ARCH_STACK_FRAMES
-	#define STACK_FRAMES  ARCH_STACK_FRAMES
-#else
-	#define STACK_FRAMES  ONE_FRAME
-#endif
 
 /** Maximum number of zones in the system. */
Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/proc/task.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -78,6 +78,6 @@
 	/** Unique identity of task. */
 	task_id_t taskid;
-	/** Task security context. */
-	context_id_t context;
+	/** Task security container. */
+	container_id_t container;
 	
 	/** Number of references (i.e. threads). */
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/proc/thread.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -49,5 +49,4 @@
 #include <sysinfo/abi.h>
 
-#define THREAD_STACK_SIZE   STACK_SIZE
 #define THREAD_NAME_BUFLEN  20
 
Index: kernel/generic/include/proc/uarg.h
===================================================================
--- kernel/generic/include/proc/uarg.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/proc/uarg.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -40,5 +40,5 @@
 	void *uspace_entry;
 	void *uspace_stack;
-
+	
 	void (* uspace_thread_function)();
 	void *uspace_thread_arg;
Index: kernel/generic/include/typedefs.h
===================================================================
--- kernel/generic/include/typedefs.h	(revision 473d5d202238ab61558d1695b8e41f478815a862)
+++ kernel/generic/include/typedefs.h	(revision 2f23341b48618ee96e5c98ec8b9f9bdd2fd1b50c)
@@ -64,5 +64,5 @@
 typedef uint64_t thread_id_t;
 typedef uint64_t task_id_t;
-typedef uint32_t context_id_t;
+typedef uint32_t container_id_t;
 
 typedef int32_t inr_t;