Fixing CircularDependencyError
Server: Fixed _insert_keys()