Update the Helper functions design.