Adding path checks