Multi-directory support and extra logging added