Completed the config directory handling