Added MAC dir support