Implemented feature type + tests