Add dictionaries to get beautiful names and stores