Added some infrastructure for poking API