Updated to new docs with protection