Add connection allocator and make scanner