Add Guard for testing