More multi-task support and initial watch support