Restructured and renamed hooks and passed params