Move integration to its own handlers