Fix #1151 Add more hooks v3