Good point.  Changed to return a Feature object.