Improvements of GDI-Injector Optimization Tools for Enhanced SI-Engine Combustion Chamber Layout