Plugin structure corrected...