Optimization & add language