Add Guard for automated testing