[ALOY-967] update methods in hook to be more generic