Added some implementation to application class