Finished adding Hookpoints for Data interactions