Added hook support