Refactor allocator again