Changed the setup method in applications