Added what we had for other helper libs