Added support for closed economy