Issue #3 - Common hooks implementation.