diff --git a/m-core.h b/m-core.h
index dc9e3496..8278b836 100644
--- a/m-core.h
+++ b/m-core.h
@@ -608,6 +608,7 @@
 #define M_SET_SET(a)             ,a,
 #define M_MOVE_MOVE(a)           ,a,
 #define M_CLEAR_CLEAR(a)         ,a,
+#define M_NEW_NEW(a)             ,a,
 #define M_DEL_DEL(a)             ,a,
 #define M_HASH_HASH(a)           ,a,
 #define M_EQUAL_EQUAL(a)         ,a,
@@ -658,8 +659,9 @@
 #define M_GET_INIT_MOVE(...) M_GET_METHOD(INIT_MOVE,   M_MOVE_DEFAULT,     __VA_ARGS__)
 #define M_GET_SET(...)       M_GET_METHOD(SET,         M_SET_DEFAULT,      __VA_ARGS__)
 #define M_GET_MOVE(...)      M_GET_METHOD(MOVE,        M_MOVE_DEFAULT,     __VA_ARGS__)
-#define M_GET_SWAP(...)      M_GET_METHOD(SWAP,        M_MOVE_DEFAULT,     __VA_ARGS__)
+#define M_GET_SWAP(...)      M_GET_METHOD(SWAP,        M_NO_DEFAULT,       __VA_ARGS__)
 #define M_GET_CLEAR(...)     M_GET_METHOD(CLEAR,       M_CLEAR_DEFAULT,    __VA_ARGS__)
+#define M_GET_NEW(...)       M_GET_METHOD(NEW,         M_NEW_DEFAULT,      __VA_ARGS__)
 #define M_GET_DEL(...)       M_GET_METHOD(DEL,         M_DEL_DEFAULT,      __VA_ARGS__)
 #define M_GET_HASH(...)      M_GET_METHOD(HASH,        M_NO_DEFAULT,       __VA_ARGS__)
 #define M_GET_EQUAL(...)     M_GET_METHOD(EQUAL,       M_EQUAL_DEFAULT,    __VA_ARGS__)
@@ -704,7 +706,8 @@
 #define M_MOVE_DEFAULT(a,b)     (M_MEMCPY_DEFAULT(a, b), M_MEMSET_DEFAULT(b))
 #define M_MEMCPY_DEFAULT(a,b)   (memcpy(&(a), &(b), sizeof (a)))
 #define M_CLEAR_DEFAULT(a)      (void)a
-#define M_DEL_DEFAULT(a)        free(a)
+#define M_NEW_DEFAULT(a)        M_MEMORY_ALLOC(a)
+#define M_DEL_DEFAULT(a)        M_MEMORY_FREE(a)
 #define M_NO_DEFAULT(...)       m_no_default_function
 #define M_EQUAL_DEFAULT(a,b)    ((a) == (b))
 #define M_CMP_DEFAULT(a,b)      ((a) < (b) ? -1 : (a) > (b))