Add if-not and when-not to feature list