More plugin hooks
Merge PaulBender