More repo handling into hook