Added check for procedures