Improve helper
0.0.8