Add property check
Update doc