Added more SOP classes to storage service