Fix small bug
Add guardian mode support