Dictionary update.

Very last update, made a type with an exception.