Added canton data, new budget converter