Little improvement on single table row case