#18 commonize to XCFeatures