Changes to check plan feature