Add and wrap 3 new functions