Started to implement better dictionary handling