Fix data structure
Wildly fail about at performance without profiling