STORM-80 : Fixed add/remove functionalities for corenova-storm