Added optimization module