Feature/implement hooks