Added dependency ordering