Minor. Dictionary.
Got rid of useless trace access.
WIP