Hotfixed bugs related to ambiguous graph keys, working on better support for submodels.