Add Multiple App support