Add check mode support