Adding some more exceptions
Adding support for directories start point