Adds subdir support