Better way to not lost the support for external applications.