Switch to heap allocator