Added few more checkers