New version, with proper feature type objects