Updated to support newer guard API