Optimizations for HEroku