Shell addon now is part of core