TODO for directory mentions