Added couple of features