Started migrating generalizable functions to a helper