Added extended toolkit