1. merged asset_classes and all_etfs
2. added GDP