added capability to have a CSP without a payment gateway configured
replaced BasicTokenManager with AnotherBasicTokenManager