#9: Frontend optimizations