Try to migrate to extension usage [not ready]