fixed dependencies ordering and cnd load