Changed to new scenario definition format, added public finance output