Using a more generic API for experimental features