refactor extention payments