Switching to Extended Toolkit