More updates

Signed-off-by: Pang Yan Han <yanhan@viki.com>