Allocator in map - closes #19