Update doc and added Guards factory