Add guard spec and sandi