Improve Application init