plugin imports improved