Added with_ to feature variables which were missing them