Add support for guard