AndrewTaro Add isInstalled flag