Make addon installation more intelligent