Code Optimized and settings options extended