Re-organized allocator paths