Improve handling of additional directories set through attributes