Add spark and small changes