Changed list init to dictionary init.