Revamp hook storage