Use newly available helpers