Added Star-Join Optimisation (no GUI yet)