add multi app support