Added mockable public api functions