Sentinel support. #30