Added possibility to use other directory