Add guard setup