More hooks for the listener
Added missing files. Not sure why they were gone