Improve compilation + add spark group