Feature/action hooks