added constraints on integer fields