Last thing left to make better. Now the dependency system is quite ok.