add new plan support and toast handle