Added more checkers