I'd move this to leap.common