Madrid System Goods and Services Database: Progress Report