Optimization and additional support.