Plugin improvememnts