Add Spotlio changes