Added optimization techniques