Try to migrate to extension usage