Some re-factoring of access of external payment systems.