Added functionality for application class