Added working directory persistence