Complete dict API, still linting