Added new code for using the SOE