Added new structure over. Decent perf observed still not the best though.