Device-specific : Adapted the new core API