Added Directory-Checks