I would move this to leap.common