Added datadir property