Changed some string keys to symbols