Still some work is needed in Application Switch