Set default to '*_STORED' everywhere, so you dont need switches later?