[MEMBER][Wen Hao] - enhance basic framework.