Hook addition and port to new framework