Optimize helpers