Enhance few things
Update doc