Add guard and spock support