Added MAC addr and dir check