FIX: external app support