Use new asset handler