Fixed dependencies for code that was broken with model structure update