Initial commit to make DemoSite account credit compatible.