Update of the src/include/spd.h file with the following improvements: