Changed core to an Application class