More convenient spikes infrastructure