Move integration to handlers