Moved hook into untyped class