Now using proper constants for hooks