Added new resolver, fixed addons