Added proper hooks to use