added Spring support