Add and update helper functions