Updated to use user.home folder to make it OS independent