Optimization functionality added