Minor refactoring (DEFAULT_ASSET_GROUPS)