Added legacy Application support