Add directory processing
Exception added