Added rolling back of features