Added spock helper support