Improve helper