Add guard support