Update class inter-dependencies