Added missing constraints