Improved some initial features like dependencies or master routings