Fix to use more generic API