Modified the application context and added a default constructor