VID-1308 moving hook class