Updated helper function names