Update documentation and implement guard