Added various checks