Add class hooks + field Hooks