Added data dir
Improved storing settings