Add spark support