Added support for new Credit manager