Refactors calls to request charts