Added INTEGER_NOT_NULL constant
Minor improvements