Use new common utils