Made it possible to work with no appId