Add class singleton and transform Application class in singleton