Moved decisions to optimization strategy