Started to add hook support