Add initial application handling