ERP-132 Refactor the common methods out