small refactoring
use own hooks module as apartment 0.23 doesn't have it anymore