Added path limiting