Added new hooks/repackaged