Extend Guard compatibility to include 2.x