Adding spock support