Adding dependency ordering