[Fix] Encapsulation and uncomment