Better expanding plugin integration #2051