Updated application context init