Add helpers; Finish 1.40