First update with complete plugin