Add Spring support