Added framework for allocator