Moved initiation logic to Application class