Improve helper loading